diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml
index 84015637eb..c19a47f37b 100644
--- a/config/alfresco/ehcache-default.xml
+++ b/config/alfresco/ehcache-default.xml
@@ -16,10 +16,10 @@
         eternal="true"
         timeToLiveSeconds="0" 
         overflowToDisk="false"/>
-    <!-- approx 1MB memory required -->
+    <!-- approx 0.4MB memory required -->
     <cache 
         name="org.hibernate.cache.UpdateTimestampsCache" 
-        maxElementsInMemory="5000"
+        maxElementsInMemory="2000"
         eternal="true" 
         overflowToDisk="false"/>
     <!-- approx 40MB memory required -->
@@ -31,7 +31,7 @@
         timeToLiveSeconds="0" 
         overflowToDisk="false" 
         />
-    <!-- approx XXX MB memory required -->
+    <!-- approx 0.1 MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.QNameEntityImpl" 
         maxElementsInMemory="100"
@@ -40,19 +40,19 @@
         timeToLiveSeconds="0" 
         overflowToDisk="false" 
         />
-    <!-- approx 20MB memory required -->
+    <!-- approx 40MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeStatusImpl" 
-        maxElementsInMemory="5000"
+        maxElementsInMemory="10000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
         overflowToDisk="false" 
         />
-    <!-- approx 40MB memory required -->
+    <!-- approx 25MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeImpl.aspects" 
-        maxElementsInMemory="10000"
+        maxElementsInMemory="20000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
@@ -61,7 +61,7 @@
     <!-- approx 50MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeImpl.properties" 
-        maxElementsInMemory="10000"
+        maxElementsInMemory="50000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
@@ -70,25 +70,25 @@
     <!-- approx 50MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeImpl.childAssocs" 
-        maxElementsInMemory="25000"
+        maxElementsInMemory="50000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
         overflowToDisk="false" 
         />
-    <!-- approx 40MB memory required -->
+    <!-- approx 50MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeImpl.parentAssocs" 
-        maxElementsInMemory="10000"
+        maxElementsInMemory="50000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
         overflowToDisk="false" 
         />
-    <!-- approx 40MB memory required -->
+    <!-- approx 70MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.ChildAssocImpl" 
-        maxElementsInMemory="25000"
+        maxElementsInMemory="50000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
@@ -97,7 +97,7 @@
     <!-- approx 20MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeImpl.sourceNodeAssocs" 
-        maxElementsInMemory="5000"
+        maxElementsInMemory="20000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
@@ -106,7 +106,7 @@
     <!-- approx 20MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.NodeImpl.targetNodeAssocs" 
-        maxElementsInMemory="5000"
+        maxElementsInMemory="20000"
         eternal="true"
         timeToIdleSeconds="0" 
         timeToLiveSeconds="0" 
@@ -131,6 +131,7 @@
         overflowToDisk="false" 
         />
     <!-- version counters -->
+    <!-- approx 0.4MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.VersionCountImpl" 
         maxElementsInMemory="100" 
@@ -149,36 +150,37 @@
         overflowToDisk="false" 
         />
     <!-- Permission related caches -->
-    <!-- approx 40MB memory required -->
+    <!-- approx 10MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl" 
         maxElementsInMemory="10000"        
         eternal="true" 
         overflowToDisk="false"/>
-    <!-- approx ??MB memory required -->
+    <!-- approx 10MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries" 
         maxElementsInMemory="10000"        
         eternal="true" 
         overflowToDisk="false"/>
-    <!-- approx 35MB memory required -->
+    <!-- approx 30MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl" 
         maxElementsInMemory="25000"        
         eternal="true" 
         overflowToDisk="false"/>
-    <!-- approx 2MB memory required -->
+    <!-- approx 1MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.DbPermissionImpl" 
         maxElementsInMemory="500"          
         eternal="true" 
         overflowToDisk="false"/>
-    <!-- approx 40MB memory required -->
+    <!-- approx 10MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl" 
         maxElementsInMemory="10000"        
         eternal="true" 
         overflowToDisk="false"/>
+     <!-- approx 5MB memory required -->
     <cache 
         name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys" 
         maxElementsInMemory="5000"
diff --git a/config/alfresco/extension/custom-hibernate-dialect.properties.sample b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
index d7fe86dd5e..54f23d546d 100644
--- a/config/alfresco/extension/custom-hibernate-dialect.properties.sample
+++ b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
@@ -10,7 +10,7 @@
 #
 # MySQL dialect (default)
 #
-#hibernate.dialect=org.hibernate.dialect.MySQLDialect
+#hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
 
 #
 # Oracle dialect
diff --git a/source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml
index cc50940a3c..8c0490ff4a 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Permission.hbm.xml
@@ -19,16 +19,6 @@
            <generator class="native" />
         </id>
 
-        <set name="entries"
-               inverse="true"
-               lazy="false" 
-               cascade="delete"
-               optimistic-lock="true"
-               fetch="join" >
-            <key column="acl_id" />
-            <one-to-many class="org.alfresco.repo.domain.hibernate.DbAccessControlEntryImpl"  />
-        </set>
-         
         <set name="entries"
                inverse="true"
                lazy="false"