diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
index a4f81080bf..1da618babd 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryProperties.java
@@ -169,7 +169,7 @@ private static String buildImmutableQueryPlanHashPrefix(String path, Set<String>
   }
 
   private static String buildImmutableQueryPlanHashSuffix(FetchConfig fetchConfig) {
-    return fetchConfig == null ? "" : "/c" + fetchConfig.hashCode();
+    return fetchConfig == null ? "}" : "/c" + fetchConfig.hashCode() + '}';
   }
 
   /**
@@ -468,7 +468,6 @@ public void queryPlanHash(StringBuilder builder) {
       filterMany.queryPlanHash(builder);
     }
     builder.append(immutableHashSuffix);
-    builder.append('}');
   }
 
   private static void appendSet(StringBuilder builder, Set<String> values) {