Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r26513e4a3a00a82cf700663c7cfe79d39c47732a -r5d1270cc9ab17a922b694e2073b464f8e91b7247
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 26513e4a3a00a82cf700663c7cfe79d39c47732a)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 5d1270cc9ab17a922b694e2073b464f8e91b7247)
@@ -383,32 +383,12 @@
                     <file-store passivation="true" purge="false"/>
                 </local-cache>
             </cache-container>
-			<cache-container name="hibernate" module="org.hibernate">
-                <local-cache name="entity" statistics-enabled="true">
-                   <!-- 
-                   	<transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="50000"/>
-                    <expiration max-idle="100000" lifespan="1000000"/>
-                   -->
+            <cache-container name="hibernate" module="org.hibernate.infinispan" statistics-enabled="false">
+                <local-cache name="entity" statistics-enabled="false">
+                    <transaction mode="NON_XA" locking="OPTIMISTIC"/>
+                    <expiration max-idle="1800000"/>
                 </local-cache>
-                <local-cache name="local-query" statistics-enabled="true">
-                   <!--
-                    <transaction mode="NONE"/>
-                    <eviction strategy="LRU" max-entries="10000"/>
-                    <expiration max-idle="100000"/>
-                   -->
-                </local-cache>
-             <!-- 
-                <local-cache name="timestamps" statistics-enabled="true">
-                    <transaction mode="NONE"/>
-                    <eviction strategy="NONE"/>
-                </local-cache>
-                <local-cache name="contentrepository-entity" statistics-enabled="true">
-                    <transaction mode="NON_XA"/>
-                    <eviction strategy="LRU" max-entries="200"/>
-                    <expiration max-idle="100000" lifespan="900000"/>
-                </local-cache>
-             -->
+                <local-cache name="timestamps"/>
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -r95c7cc217c4fbb3110106db4ee1a6f603625b5e9 -r5d1270cc9ab17a922b694e2073b464f8e91b7247
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 95c7cc217c4fbb3110106db4ee1a6f603625b5e9)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 5d1270cc9ab17a922b694e2073b464f8e91b7247)
@@ -14,23 +14,14 @@
 			<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
 			<prop key="hibernate.show_sql">false</prop>
 			<prop key="hibernate.current_session_context_class">org.lamsfoundation.lams.util.hibernate.TransactionAwareSessionContext</prop>
-		    <prop key="hibernate.cache.use_second_level_cache">false</prop>
+		    <prop key="hibernate.cache.use_second_level_cache">true</prop>
 		    <prop key="hibernate.cache.use_query_cache">false</prop>
             <prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/container/hibernate</prop>
-            <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.infinispan.JndiInfinispanRegionFactory</prop>
+            <prop key="hibernate.cache.region.factory_class">org.jboss.as.jpa.hibernate5.infinispan.InfinispanRegionFactory</prop>
             <prop key="hibernate.cache.default_cache_concurrency_strategy">TRANSACTIONAL</prop>
             <prop key="hibernate.transaction.jta.platform">org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</prop>   
             <prop key="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</prop>   
             <prop key="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</prop>
-             
-            <!-- 
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNode.cfg">contentrepository-entity</prop>
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNode.crNodeVersions.cfg">contentrepository-entity</prop>
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersion.cfg">contentrepository-entity</prop>
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersion.crNodeVersionProperties.cfg">contentrepository-entity</prop>
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty.cfg">contentrepository-entity</prop>
-            <prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.contentrepository.CrWorkspace.cfg">contentrepository-entity</prop>	
-            -->		
 		</props>
 		</property>
   	</bean>