=== 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-11-18 16:46:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-11-18 21:52:06 +0000
@@ -458,12 +458,20 @@
     <property name="sessionFactory" ref="sessionFactory" />
   </bean>
 
-  <bean id="org.hisp.dhis.program.ProgramStore" class="org.hisp.dhis.program.hibernate.HibernateProgramStore">
+  <bean id="org.hisp.dhis.program.ProgramStore" 
+    class="org.hisp.dhis.program.hibernate.HibernateProgramStore">
     <property name="clazz" value="org.hisp.dhis.program.Program" />
     <property name="sessionFactory" ref="sessionFactory" />
     <property name="cacheable" value="true" />
   </bean>
 
+  <bean id="org.hisp.dhis.program.ProgramTrackedEntityAttributeStore" 
+    class="org.hisp.dhis.program.hibernate.HibernateProgramTrackedEntityAttributeStore">
+    <property name="clazz" value="org.hisp.dhis.program.ProgramTrackedEntityAttribute" />
+    <property name="sessionFactory" ref="sessionFactory" />     
+    <property name="cacheable" value="true" /> 
+  </bean>
+
   <bean id="org.hisp.dhis.program.ProgramValidationStore"
     class="org.hisp.dhis.program.hibernate.HibernateProgramValidationStore">
     <property name="clazz" value="org.hisp.dhis.program.ProgramValidation" />
@@ -476,12 +484,6 @@
     <property name="sessionFactory" ref="sessionFactory" />
   </bean>
 
-  <bean id="org.hisp.dhis.program.ProgramTrackedEntityAttributeStore" 
-    class="org.hisp.dhis.program.hibernate.HibernateProgramTrackedEntityAttributeStore">
-    <property name="clazz" value="org.hisp.dhis.program.ProgramTrackedEntityAttribute" />
-    <property name="sessionFactory" ref="sessionFactory" />      
-  </bean>
-
   <bean id="org.hisp.dhis.trackedentity.TrackedEntityInstanceStore"
     class="org.hisp.dhis.trackedentity.hibernate.HibernateTrackedEntityInstanceStore">
     <property name="clazz" value="org.hisp.dhis.trackedentity.TrackedEntityInstance" />