=== 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-11 21:39:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2015-10-12 12:23:58 +0000
@@ -486,6 +486,7 @@
     class="org.hisp.dhis.trackedentity.hibernate.HibernateTrackedEntityAttributeStore">
     <property name="clazz" value="org.hisp.dhis.trackedentity.TrackedEntityAttribute" />
     <property name="sessionFactory" ref="sessionFactory" />
+    <property name="cacheable" value="true" />
   </bean>
 
   <bean id="org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValueStore"

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml	2015-09-03 08:15:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml	2015-10-12 12:23:58 +0000
@@ -8,6 +8,8 @@
 <hibernate-mapping>
   <class name="org.hisp.dhis.trackedentity.TrackedEntityAttribute" table="trackedentityattribute">
 
+    <cache usage="read-write" />
+    
     <id name="id" column="trackedentityattributeid">
       <generator class="native" />
     </id>