Index: lams_build/conf/standalone.xml
===================================================================
diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -re913655cb6626bb5a90e02a525434ea3bd89df6a
--- lams_build/conf/standalone.xml	(.../standalone.xml)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
+++ lams_build/conf/standalone.xml	(.../standalone.xml)	(revision e913655cb6626bb5a90e02a525434ea3bd89df6a)
@@ -470,16 +470,31 @@
                 </local-cache> 
             </cache-container>
             <cache-container name="hibernate" default-cache="entity" module="org.infinispan.hibernate-cache" statistics-enabled="true">
+            	<local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"  />
+                </local-cache>
+                <local-cache name="timestamps"/> 
+            
+                <!-- These settings should be used on MULTINODE ENVIRONMENT.
+                 	  See matching settings in LAMS applicationContext.xml
                 <local-cache name="entity">
-                    <transaction mode="NON_XA" />
-                    <object-memory />
-                    <expiration lifespan="5000" interval="1000" />
+                    <transaction mode="NON_XA"/>
+                    <object-memory size="10000"/>
+                    <expiration lifespan="3000" interval="1000"/>
                 </local-cache>
                 <local-cache name="local-query">
-                    <object-memory />
-                    <expiration lifespan="5000" interval="1000"/>
+                    <object-memory size="10000"/>
+                    <expiration lifespan="3000" interval="1000"/>
                 </local-cache>
-                <local-cache name="timestamps"/>
+                <local-cache name="timestamps"/> 
+                 -->
+                
             </cache-container>
         </subsystem>
         <subsystem xmlns="urn:jboss:domain:io:3.0">
Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -rfd9592fa74d56ccd0719c7245b3424b3523f2197 -re913655cb6626bb5a90e02a525434ea3bd89df6a
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision fd9592fa74d56ccd0719c7245b3424b3523f2197)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision e913655cb6626bb5a90e02a525434ea3bd89df6a)
@@ -15,31 +15,58 @@
 			<prop key="hibernate.show_sql">false</prop>
 			<prop key="hibernate.current_session_context_class">org.lamsfoundation.lams.util.hibernate.TransactionAwareSessionContext</prop>
 			
+			<prop key="hibernate.transaction.jta.platform">org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</prop>   
+            <prop key="hibernate.transaction.coordinator_class">jta</prop>   
+            
 			<prop key="hibernate.cache.use_query_cache">true</prop>
 		    <prop key="hibernate.cache.use_second_level_cache">true</prop>
-            <prop key="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</prop>
-            <prop key="hibernate.cache.infinispan.entity.eviction.strategy">NONE</prop>
-			<prop key="hibernate.cache.infinispan.query.eviction.strategy">NONE</prop>
-            <prop key="hibernate.cache.infinispan.entity.expiration.lifespan">5000</prop>
-			<prop key="hibernate.cache.infinispan.query.expiration.lifespan">5000</prop>
+		    <prop key="hibernate.cache.infinispan.statistics">true</prop>
+            <prop key="javax.persistence.sharedCache.mode">ALL</prop>
+            
+            <!-- Following configuration should be used in MULTINODE ENVIRONMENT
+            	 before proper distributed cache configuration is not implemented.
+            	 It creates local cache with short life span, minimising danger of stale cache on each node.
+            	 
+            	 Default parameters are:
+            	 https://infinispan.org/docs/stable/titles/hibernate/hibernate.html#default_cluster_configuration_second_level
+            	 * Eviction wake up interval is 5 seconds.
+				 * Max number of entries are 10,000.
+				 * Max idle time before expiration is 100 seconds.
+				 * Default eviction algorithm is LRU, least recently used.
+            	  
+            <prop key="hibernate.cache.infinispan.entity.expiration.lifespan">3000</prop>
+			<prop key="hibernate.cache.infinispan.query.expiration.lifespan">3000</prop>
             <prop key="hibernate.cache.infinispan.entity.expiration.max_idle">-1</prop>
 			<prop key="hibernate.cache.infinispan.query.expiration.max_idle">-1</prop>
             <prop key="hibernate.cache.infinispan.entity.expiration.wake_up_interval">1000</prop>
 			<prop key="hibernate.cache.infinispan.query.expiration.wake_up_interval">1000</prop>
-			<prop key="hibernate.cache.infinispan.statistics">true</prop>
+			 -->
+			 
+			 <!-- Below are immutable entities which can be kept in cache forever.
+			 	  Configuration is modified for each of them as defining a separate cache configuration template does not seem possible
+			 	  for EAR on WildFly without an explicit persistent unit configuration.
+			 	  None of these configuration entries work:
+			 <prop key="hibernate.cache.infinispan.lams.ear#org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
+			 <prop key="hibernate.cache.infinispan.lams.ear#default.org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
+			 <prop key="hibernate.cache.infinispan.lams.ear#null.org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
+			 -->
+			 
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.learningdesign.LearningLibrary.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.themes.Theme.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.timezone.Timezone.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.tool.Tool.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.tool.SystemTool.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.AuthenticationMethodType.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.OrganisationState.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.OrganisationType.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.Role.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.usermanagement.SupportedLocale.expiration.max_idle">-1</prop>
+			<prop key="hibernate.cache.infinispan.org.lamsfoundation.lams.logevent.LogEventType.expiration.max_idle">-1</prop>
 
-            <prop key="hibernate.transaction.jta.platform">org.hibernate.service.jta.platform.internal.JBossAppServerJtaPlatform</prop>   
-            <prop key="hibernate.transaction.coordinator_class">jta</prop>   
-            
-            <!-- 
+
+            <!-- These are obsolete settings but left here as a reminder what we set up in the past.
             <prop key="hibernate.cache.region.factory_class">org.infinispan.hibernate.cache.v53.InfinispanRegionFactory</prop>
             <prop key="hibernate.cache.default_cache_concurrency_strategy">TRANSACTIONAL</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>