diff --git a/src/main/java/io/ebean/text/PathProperties.java b/src/main/java/io/ebean/text/PathProperties.java
index 174fe016b..116468d00 100644
--- a/src/main/java/io/ebean/text/PathProperties.java
+++ b/src/main/java/io/ebean/text/PathProperties.java
@@ -89,8 +89,7 @@ public class PathProperties implements FetchPath {
   }
 
   Props getProps(String path) {
-    Props props = pathMap.computeIfAbsent(path, p -> new Props(this, null, p));
-    return props;
+    return pathMap.computeIfAbsent(path, p -> new Props(this, null, p));
   }
 
   public Collection<Props> getPathProps() {
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index d3c3e8e8f..f3bf893bc 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -157,7 +157,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> implements ST
     if (elementCollection) {
       targetDescriptor = elementDescriptor;
     } else {
-      targetDescriptor = descriptor.getBeanDescriptor(targetType);
+      super.initialiseTargetDescriptor(initContext);
     }
   }
 
diff --git a/src/test/resources/ebean.properties b/src/test/resources/ebean.properties
index 33121aa37..40d0c41db 100644
--- a/src/test/resources/ebean.properties
+++ b/src/test/resources/ebean.properties
@@ -11,9 +11,10 @@
 
 ebean.encryptKeyManager=org.tests.basic.encrypt.BasicEncyptKeyManager
 
-#ebean.autotune.querytuning=true
-#ebean.autotune.profiling=true
-#ebean.autotune.profilingUpdateFrequency=5
+#ebean.disableL2Cache=true
+#ebean.autoTune.queryTuning=true
+#ebean.autoTune.profiling=true
+#ebean.autoTune.profilingUpdateFrequency=5
 
 ebean.ddl.generate=true
 ebean.ddl.run=true