Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethod.hbm.xml	(.../AuthenticationMethod.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -21,6 +21,8 @@
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="read-only" />
+
     <id
         name="authenticationMethodId"
         type="java.lang.Integer"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/AuthenticationMethodType.hbm.xml	(.../AuthenticationMethodType.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -21,6 +21,8 @@
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="read-only" />
+
     <id
         name="authenticationMethodTypeId"
         type="java.lang.Integer"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
===================================================================
diff -u -rc21c3386cec2ee819ba267d84d532676d2f4990d -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision c21c3386cec2ee819ba267d84d532676d2f4990d)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml	(.../Organisation.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -20,7 +20,9 @@
         table="lams_organisation"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
-
+	
+	<cache usage="transactional" />
+	
     <id
         name="organisationId"
         type="java.lang.Integer"
@@ -214,6 +216,8 @@
            @hibernate.collection-one-to-many
             class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
         </meta>
+        
+        <cache usage="transactional" />
         <key>
             <column name="organisation_id" />
         </key>
@@ -240,6 +244,8 @@
            @hibernate.collection-one-to-many
             class="org.lamsfoundation.lams.usermanagement.Organisation"
         </meta>
+        
+        <cache usage="transactional" />
         <key>
             <column name="parent_organisation_id" />
         </key>
@@ -289,13 +295,11 @@
     <many-to-one
         name="locale"
         class="org.lamsfoundation.lams.usermanagement.SupportedLocale"
-        lazy="false"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-            lazy="false"
            @hibernate.column name="locale_id"         
         </meta>
         <column name="locale_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml
===================================================================
diff -u -r406b18aaa75b530285082e1239492c05d816d8ac -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml	(.../OrganisationState.hbm.xml)	(revision 406b18aaa75b530285082e1239492c05d816d8ac)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationState.hbm.xml	(.../OrganisationState.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -20,6 +20,8 @@
         table="lams_organisation_state"
     </meta>
 
+	<cache usage="read-only" />
+
     <id
         name="organisationStateId"
         type="java.lang.Integer"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/OrganisationType.hbm.xml	(.../OrganisationType.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -21,6 +21,8 @@
         proxy="org.lamsfoundation.lams.usermanagement.OrganisationType"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
+	
+	<cache usage="read-only" />
 
     <id
         name="organisationTypeId"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml
===================================================================
diff -u -r55cd693d93a5a28ae90c626159e028ea796653e8 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision 55cd693d93a5a28ae90c626159e028ea796653e8)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Role.hbm.xml	(.../Role.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -21,6 +21,8 @@
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="read-only" />
+
     <id
         name="roleId"
         type="java.lang.Integer"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml
===================================================================
diff -u -r0ff427cbcf60a11b06f033886c617ade68044542 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision 0ff427cbcf60a11b06f033886c617ade68044542)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/SupportedLocale.hbm.xml	(.../SupportedLocale.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -10,6 +10,7 @@
         name="org.lamsfoundation.lams.usermanagement.SupportedLocale"
         table="lams_supported_locale"
     >
+		<cache usage="read-only" />
 
         <id
             name="localeId"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -rc21c3386cec2ee819ba267d84d532676d2f4990d -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision c21c3386cec2ee819ba267d84d532676d2f4990d)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -15,12 +15,15 @@
     name="org.lamsfoundation.lams.usermanagement.User" 
     table="lams_user"
 >
+	
     <meta attribute="class-description" inherit="false">
        @hibernate.class
         table="lams_user"
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="transactional" />
+
     <id
         name="userId"
         type="java.lang.Integer"
@@ -283,13 +286,11 @@
     <!-- bi-directional many-to-one association to Workspace -->
     <many-to-one
         name="workspace"
-        lazy="false"
         cascade="all"
         class="org.lamsfoundation.lams.usermanagement.Workspace"     
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
-	         lazy="false"
 	         cascade="all"
            @hibernate.column name="workspace_id"         
         </meta>
@@ -298,13 +299,11 @@
     <!-- bi-directional one-to-many association to UserOrganisation -->
     <set
         name="userOrganisations"
-        lazy="false"
         inverse="true"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="false"
             inverse="true"
             cascade="all-delete-orphan"
 
@@ -314,6 +313,9 @@
            @hibernate.collection-one-to-many
             class="org.lamsfoundation.lams.usermanagement.UserOrganisation"
         </meta>
+        
+        <cache usage="transactional" />
+
         <key>
             <column name="user_id" />
         </key>
@@ -325,8 +327,8 @@
     <many-to-one
         name="authenticationMethod"
         class="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
-        lazy="false"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
@@ -339,12 +341,13 @@
     <!-- bi-directional many-to-one association to CSSTheme -->
     <many-to-one
         name="flashTheme"
-        lazy="false"
         class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
+        lazy="false"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
+	        lazy="false"
             not-null="true"
            @hibernate.column name="flash_theme_id"         
         </meta>
@@ -354,12 +357,13 @@
     <!-- bi-directional many-to-one association to CSSTheme -->
     <many-to-one
         name="htmlTheme"
-        lazy="false"
         class="org.lamsfoundation.lams.themes.CSSThemeVisualElement"
+        lazy="false"
         not-null="true"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
+	        lazy="false"
             not-null="true"
            @hibernate.column name="html_theme_id"         
         </meta>
@@ -435,13 +439,13 @@
     <many-to-one
         name="locale"
         class="org.lamsfoundation.lams.usermanagement.SupportedLocale"
-        lazy="false"
         not-null="true"
+        lazy="false"
     >
         <meta attribute="field-description">
            @hibernate.many-to-one
             not-null="true"
-            lazy="false"
+	        lazy="false"
            @hibernate.column name="locale_id"         
         </meta>
         <column name="locale_id" />
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -21,6 +21,8 @@
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="transactional" />
+	
     <id
         name="userOrganisationId"
         type="java.lang.Integer"
@@ -57,13 +59,11 @@
     <!-- bi-directional one-to-many association to UserOrganisationRole -->
     <set
         name="userOrganisationRoles"
-        lazy="false"
         inverse="true"
 		cascade="all-delete-orphan"
     >
         <meta attribute="field-description">
            @hibernate.set
-            lazy="false"
             inverse="true"
             cascade="all-delete-orphan"
 
@@ -73,6 +73,9 @@
            @hibernate.collection-one-to-many
             class="org.lamsfoundation.lams.usermanagement.UserOrganisationRole"
         </meta>
+        
+        <cache usage="transactional" />
+        
         <key>
             <column name="user_organisation_id" />
         </key>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml
===================================================================
diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -rcadb456a32c5e95823f3472fd99a0b17c52b9218
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.hbm.xml	(.../UserOrganisationRole.hbm.xml)	(revision cadb456a32c5e95823f3472fd99a0b17c52b9218)
@@ -21,6 +21,8 @@
     </meta>
     <meta attribute="implement-equals" inherit="false">true</meta>
 
+	<cache usage="transactional" />
+
     <id
         name="userOrganisationRoleId"
         type="java.lang.Integer"