Index: oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java	(revision 1423797)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStore.java	(working copy)
@@ -60,7 +60,7 @@
     private volatile Observer observer = EmptyObserver.INSTANCE;
 
     private final LoadingCache<String, KernelNodeState> cache =
-            CacheBuilder.newBuilder().maximumSize(10000).build(
+            CacheBuilder.newBuilder().weakKeys().maximumSize(10000).build(
                     new CacheLoader<String, KernelNodeState>() {
                         @Override
                         public KernelNodeState load(String key) {
Index: oak-parent/pom.xml
===================================================================
--- oak-parent/pom.xml	(revision 1423797)
+++ oak-parent/pom.xml	(working copy)
@@ -34,7 +34,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <test.opts>-Xmx512m -XX:MaxPermSize=32m</test.opts>
+    <test.opts>-Xmx128m -XX:MaxPermSize=32m -XX:+HeapDumpOnOutOfMemoryError</test.opts>
     <skip.deployment>false</skip.deployment>
     <known.issues />
     <project.reporting.outputEncoding>