diff --git a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
index <HASH>..<HASH> 100644
--- a/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
+++ b/grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java
@@ -3460,13 +3460,13 @@ public class GrailsDomainBinder implements MetadataContributor {
         protected final GrailsDomainBinder binder;
         protected final MetadataBuildingContext buildingContext;
 
-        protected static CollectionType SET;
-        protected static CollectionType LIST;
-        protected static CollectionType BAG;
-        protected static CollectionType MAP;
-        protected static boolean initialized;
+        protected CollectionType SET;
+        protected CollectionType LIST;
+        protected CollectionType BAG;
+        protected CollectionType MAP;
+        protected boolean initialized;
 
-        protected static final Map<Class<?>, CollectionType> INSTANCES = new HashMap<>();
+        protected final Map<Class<?>, CollectionType> INSTANCES = new HashMap<>();
 
         public abstract Collection create(ToMany property, PersistentClass owner,
                                           String path, InFlightMetadataCollector mappings, String sessionFactoryBeanName) throws MappingException;
fix for #<I> (#<I>)