=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-10-07 23:01:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-10-11 21:39:47 +0000
@@ -384,12 +384,14 @@
     class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
     <property name="clazz" value="org.hisp.dhis.legend.Legend" />
     <property name="sessionFactory" ref="sessionFactory" />
+    <property name="cacheable" value="true" />
   </bean>
 
   <bean id="org.hisp.dhis.legend.LegendSetStore"
     class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
     <property name="clazz" value="org.hisp.dhis.legend.LegendSet" />
     <property name="sessionFactory" ref="sessionFactory" />
+    <property name="cacheable" value="true" />
   </bean>
 
   <bean id="org.hisp.dhis.sms.hibernate.IncomingSmsStore"
@@ -412,6 +414,7 @@
     class="org.hisp.dhis.program.hibernate.HibernateProgramIndicatorStore">
     <property name="clazz" value="org.hisp.dhis.program.ProgramIndicator" />
     <property name="sessionFactory" ref="sessionFactory" />
+    <property name="cacheable" value="true" />
   </bean>
 
   <bean id="org.hisp.dhis.relationship.RelationshipStore"

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/Legend.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/Legend.hbm.xml	2015-08-31 14:41:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/Legend.hbm.xml	2015-10-11 21:39:47 +0000
@@ -8,6 +8,8 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.legend.Legend" table="maplegend">
 
+    <cache usage="read-write" />
+    
     <id name="id" column="maplegendid">
       <generator class="native" />
     </id>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/LegendSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/LegendSet.hbm.xml	2015-02-24 13:16:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/LegendSet.hbm.xml	2015-10-11 21:39:47 +0000
@@ -8,6 +8,8 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.legend.LegendSet" table="maplegendset">
 
+    <cache usage="read-write" />
+    
     <id name="id" column="maplegendsetid">
       <generator class="native" />
     </id>
@@ -18,6 +20,7 @@
     <property name="symbolizer" column="symbolizer" />
 
     <set name="legends" table="maplegendsetmaplegend">
+      <cache usage="read-write" />
       <key column="legendsetid" foreign-key="fk_maplegendsetmaplegend_legendsetid" />
       <many-to-many column="maplegendid" class="org.hisp.dhis.legend.Legend" foreign-key="fk_maplegendset_maplegend" />
     </set>

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-10-04 20:41:27 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml	2015-10-11 21:39:47 +0000
@@ -8,6 +8,8 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.program.ProgramIndicator" table="programindicator">
 
+    <cache usage="read-write" />
+	
     <id name="id" column="programindicatorid">
       <generator class="native" />
     </id>