Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r9da35349a62686e5112d5be703c9047c48d88467 -r1dee5efe63e074e7866fb9ae8ac66991e794cf6b
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 9da35349a62686e5112d5be703c9047c48d88467)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision 1dee5efe63e074e7866fb9ae8ac66991e794cf6b)
@@ -292,18 +292,18 @@
                     <file-store passivation="false" purge="false"/>
                 </local-cache>
             </cache-container>
-            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
-                <local-cache name="entity">
+            <cache-container name="hibernate" default-cache="local-query" module="org.hibernate" start="EAGER">
+                <local-cache name="entity" start="EAGER">
                     <transaction mode="NON_XA"/>
                     <eviction strategy="LRU" max-entries="10000"/>
                     <expiration max-idle="100000"/>
                 </local-cache>
-                <local-cache name="local-query">
+                <local-cache name="local-query" start="EAGER">
                     <transaction mode="NONE"/>
                     <eviction strategy="LRU" max-entries="10000"/>
                     <expiration max-idle="100000"/>
                 </local-cache>
-                <local-cache name="timestamps">
+                <local-cache name="timestamps" start="EAGER">
                     <transaction mode="NONE"/>
                     <eviction strategy="NONE"/>
                 </local-cache>
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -rce9453335b5baf70c2ab13a11f0f3bb08cca7bb9 -r1dee5efe63e074e7866fb9ae8ac66991e794cf6b
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision ce9453335b5baf70c2ab13a11f0f3bb08cca7bb9)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 1dee5efe63e074e7866fb9ae8ac66991e794cf6b)
@@ -17,10 +17,12 @@
 			<prop key="hibernate.c3p0.maxPoolSize">20</prop>
 			<prop key="hibernate.c3p0.timeout">1800</prop>
 			<prop key="hibernate.c3p0.max_statement">50</prop>
-			<prop key="hibernate.cache.region.factory_class">org.jboss.as.jpa.hibernate4.infinispan.InfinispanRegionFactory</prop>
-			<prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/container/hibernate</prop>
+			
+		    <prop key="hibernate.cache.use_second_level_cache">true</prop>
+            <!-- <prop key="hibernate.cache.use_query_cache">true</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.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</prop>
-			<prop key="hibernate.cache.use_second_level_cache">false</prop>
 			
 			<!--
 			<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.jbc2.SharedJBossCacheRegionFactory</prop>