Index: lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
===================================================================
diff -u -r1844238a2f60615475db8855871a1488d04e629b -rce9453335b5baf70c2ab13a11f0f3bb08cca7bb9
--- lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision 1844238a2f60615475db8855871a1488d04e629b)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml	(.../applicationContext.xml)	(revision ce9453335b5baf70c2ab13a11f0f3bb08cca7bb9)
@@ -6,9 +6,7 @@
            				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
  	<!-- Hibernate Properties. Should be used by all Hibernate session factories unless -->
-  	<!--  the tool has a specific need for a different setting. 						-->			
-  	<!-- If you change hibernate.treecache.objectName, you will also need to change the -->
-  	<!--  cacheManager object 															-->
+  	<!--  the tool has a specific need for a different setting. 						-->
   	<bean id="hibernateProperties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
   	
 	  	<property name="properties">
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r36855148d0e3028a6f5651d0ce51aa0d1bf8de1a -rce9453335b5baf70c2ab13a11f0f3bb08cca7bb9
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 36855148d0e3028a6f5651d0ce51aa0d1bf8de1a)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision ce9453335b5baf70c2ab13a11f0f3bb08cca7bb9)
@@ -419,12 +419,6 @@
 		<property name="monitorPeriod"><value>60</value></property>
 	</bean>
 	
-	<!-- Cache Manager bean. cacheObjectName should be the same value as hibernate.treecache.objectName -->
-	<bean id="cacheManager" class="org.lamsfoundation.lams.cache.CacheManager">
-		<property name="cacheObjectName"><value>jboss.cache:service=TreeCache</value></property>
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
 	<bean id="statisticsService" class="org.lamsfoundation.lams.statistics.service.StatisticsService">
    		<property name="baseDAO">
    			<ref bean="baseDAO"/>