=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2015-07-13 11:12:16 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2015-08-12 05:41:14 +0000
@@ -50,9 +50,11 @@
  */
 public class DefaultSchemaService implements SchemaService
 {
-    private Map<Class<?>, Schema> classSchemaMap = Maps.newHashMap();
-
-    private Map<String, Schema> singularSchemaMap = Maps.newHashMap();
+    private Map<Class<?>, Schema> classSchemaMap = new HashMap<>();
+
+    private Map<String, Schema> singularSchemaMap = new HashMap<>();
+
+    private Map<Class<?>, Schema> dynamicClassSchemaMap = new HashMap<>();
 
     @Autowired
     private PropertyIntrospectorService propertyIntrospectorService;
@@ -104,6 +106,11 @@
             return classSchemaMap.get( klass );
         }
 
+        if ( dynamicClassSchemaMap.containsKey( klass ) )
+        {
+            return dynamicClassSchemaMap.get( klass );
+        }
+
         return null;
     }
 
@@ -133,7 +140,7 @@
 
         updateSelf( schema );
 
-        classSchemaMap.put( klass, schema );
+        dynamicClassSchemaMap.put( klass, schema );
 
         return schema;
     }