Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -260,15 +260,15 @@
     @ManyToMany
     @JoinTable(name = "lams_input_activity", joinColumns = @JoinColumn(name = "activity_id"), inverseJoinColumns = @JoinColumn(name = "input_activity_id"))
     @OrderBy("activity_id")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Activity> inputActivities = new HashSet<>();
 
     /**
      * The BranchActivityEntries that map conditions to this Activity; bi-directional association required (e.g.
      * LDEV-1910)
      */
     @OneToMany(mappedBy = "branchingActivity", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<BranchActivityEntry> branchActivityEntries = new HashSet<>();
 
     // ---------------------------------------------------------------------
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java	(.../ComplexActivity.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java	(.../ComplexActivity.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -59,7 +59,7 @@
     @OneToMany(mappedBy = "parentActivity", fetch = FetchType.EAGER)
     @Cascade(CascadeType.SAVE_UPDATE)
     @SortComparator(ActivityOrderComparator.class)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Activity> activities = new TreeSet<>(new ActivityOrderComparator());
 
     @OneToOne(fetch = FetchType.LAZY)
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java	(.../LearningDesign.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -146,24 +146,24 @@
     private LearningDesign originalLearningDesign;
 
     @OneToMany(mappedBy = "learningDesign")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Lesson> lessons = new HashSet<>();
 
     @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Transition> transitions = new HashSet<>();
 
     @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true)
     @SortComparator(ActivityOrderComparator.class)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Activity> activities = new TreeSet<>(new ActivityOrderComparator());
 
     @OneToMany(mappedBy = "learningDesign", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Competence> competences = new HashSet<>();
 
     @OneToMany(mappedBy = "learningDesignId", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<LearningDesignAnnotation> annotations = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(.../LearningLibrary.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningLibrary.java	(.../LearningLibrary.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -65,7 +65,7 @@
     private Date createDateTime;
 
     @OneToMany(mappedBy = "learningLibrary")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Activity> activities = new HashSet<Activity>();
 
     @Column(name = "valid_flag")
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -61,7 +61,7 @@
     private static Logger log = Logger.getLogger(SequenceActivity.class);
 
     @OneToMany(mappedBy = "branchSequenceActivity", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<BranchActivityEntry> branchEntries = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.EAGER)
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -268,12 +268,12 @@
      */
     @ManyToMany
     @JoinTable(name = "lams_lesson_dependency", joinColumns = @JoinColumn(name = "lesson_id"), inverseJoinColumns = @JoinColumn(name = "preceding_lesson_id"))
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Lesson> precedingLessons = new HashSet<>();
 
     @ManyToMany
     @JoinTable(name = "lams_lesson_dependency", joinColumns = @JoinColumn(name = "preceding_lesson_id"), inverseJoinColumns = @JoinColumn(name = "lesson_id"))
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Lesson> succeedingLessons = new HashSet<>();
 
     // ---------------------------------------------------------------------
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 2188972474f8d186d6811e3dea2e4136be669335)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -159,12 +159,12 @@
     @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
     @OrderBy("displayOrder")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbOption> qbOptions = new ArrayList<>();
 
     @OneToMany(mappedBy = "qbQuestion", cascade = CascadeType.ALL)
     @Fetch(FetchMode.SUBSELECT)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private List<QbQuestionUnit> units = new ArrayList<>();
 
     // non-persistent field, useful for displaying other versions of this question
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	(.../Tool.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java	(.../Tool.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -106,7 +106,7 @@
 
     @OneToMany(fetch = FetchType.EAGER)
     @JoinColumn(name = "tool_id")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ExtServerToolAdapterMap> mappedServers = new HashSet<ExtServerToolAdapterMap>();
 
     @Column(name = "grouping_support_type_id")
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java	(.../Organisation.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -81,24 +81,24 @@
     private User createdBy;
 
     @OneToMany(mappedBy = "organisationID", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<WorkspaceFolder> workspaceFolders = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "organisation_type_id")
     private OrganisationType organisationType;
 
     @OneToMany(mappedBy = "organisation", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<UserOrganisation> userOrganisations = new HashSet<>();
 
     @OneToMany(mappedBy = "parentOrganisation", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Organisation> childOrganisations = new HashSet<>();
 
     @OneToMany(mappedBy = "organisation", cascade = CascadeType.ALL, orphanRemoval = true)
     @LazyCollection(LazyCollectionOption.EXTRA)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<Lesson> lessons = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -185,20 +185,20 @@
     @OneToMany
     @JoinColumn(name = "assessment_uid")
     @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<AssessmentQuestion> questions = new TreeSet<>();
 
     // assessment questions references that form question list
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "assessment_uid")
     @OrderBy("sequence_id ASC")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "assessment_uid")
     @OrderBy("sequence_id ASC")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<AssessmentOverallFeedback> overallFeedbacks = new TreeSet<>(new SequencableComparator());
 
     // **********************************************************
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java	(.../Chat.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java	(.../Chat.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -100,12 +100,12 @@
     private Date submissionDeadline;
 
     @OneToMany(mappedBy = "chat", cascade = CascadeType.ALL)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ChatSession> chatSessions = new HashSet<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "content_uid")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ChatCondition> conditions = new TreeSet<>(new TextSearchConditionComparator());
 
     public Chat() {
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java	(.../Daco.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/Daco.java	(.../Daco.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -101,7 +101,7 @@
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "daco", cascade = CascadeType.ALL)
     @OrderBy("uid ASC")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<DacoQuestion> dacoQuestions = new LinkedHashSet<>();
 
     @Column(name = "reflect_on_activity")
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java	(.../Forum.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/Forum.java	(.../Forum.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -170,7 +170,7 @@
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "content_uid")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ForumCondition> conditions;
 
     /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	(.../ImageGallery.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java	(.../ImageGallery.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -103,7 +103,7 @@
     @OneToMany(cascade = CascadeType.ALL)
     @OrderBy("order_id ASC")
     @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<LearnerItemRatingCriteria> ratingCriterias = new HashSet<>();
 
     @Column(name = "reflect_on_activity")
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	(.../CommonCartridge.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	(.../CommonCartridge.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -103,7 +103,7 @@
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "commonCartridge_uid")
     @OrderBy("create_date DESC")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<CommonCartridgeItem> commonCartridgeItems = new HashSet<>();;
 
     @Column(name = "reflect_on_activity")
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java	(.../McContent.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java	(.../McContent.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -126,11 +126,11 @@
 
     @OneToMany(mappedBy = "mcContent", cascade = CascadeType.ALL)
     @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<McQueContent> mcQueContents;
 
     @OneToMany(mappedBy = "mcContent", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<McSession> mcSessions;
 
     /** full constructor */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaContent.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaContent.java	(.../QaContent.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaContent.java	(.../QaContent.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -133,21 +133,21 @@
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "tool_content_id", referencedColumnName = "qa_content_id")
     @OrderBy("orderId asc")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<LearnerItemRatingCriteria> ratingCriterias;
 
     @OneToMany(mappedBy = "qaContent", cascade = CascadeType.ALL)
     @OrderBy("displayOrder")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<QaQueContent> qaQueContents;
 
     @OneToMany(mappedBy = "qaContent", cascade = CascadeType.ALL)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<QaSession> qaSessions;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "content_uid")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<QaCondition> conditions;
 
     public QaContent() {
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java	(.../Resource.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -130,7 +130,7 @@
     @OneToMany(cascade = CascadeType.ALL)
     @OrderBy("order_id ASC")
     @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<LearnerItemRatingCriteria> ratingCriterias = new HashSet<>();
 
     // *************** NON Persist Fields ********************
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java	(.../Leaderselection.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.java	(.../Leaderselection.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -76,7 +76,7 @@
     private Long toolContentId;
 
     @OneToMany(mappedBy = "leaderselection")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<LeaderselectionSession> leaderselectionSessions = new HashSet<>();
 
     public Long getUid() {
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java	(.../Mindmap.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java	(.../Mindmap.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -117,7 +117,7 @@
     private String galleryWalkInstructions;
 
     @OneToMany(mappedBy = "mindmap")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<MindmapSession> mindmapSessions;
 
     // Constructors
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -101,7 +101,7 @@
     private boolean allowAnonymous;
 
     @OneToMany(mappedBy = "nbContent", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<NoticeboardSession> nbSessions;
 
     /** default constructor */
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	(.../Notebook.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java	(.../Notebook.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -94,12 +94,12 @@
     private Long toolContentId;
 
     @OneToMany(mappedBy = "notebook")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<NotebookSession> notebookSessions = new HashSet<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "content_uid")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<NotebookCondition> conditions = new TreeSet<>(new TextSearchConditionComparator());
 
     public Long getUid() {
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	(.../Peerreview.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	(.../Peerreview.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -86,7 +86,7 @@
     @Cascade(CascadeType.ALL)
     @JoinColumn(name = "tool_content_id", referencedColumnName = "content_id")
     @OrderBy("orderId asc")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<LearnerItemRatingCriteria> ratingCriterias;
 
     @Column(name = "lock_on_finished")
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -90,7 +90,7 @@
     @OneToMany
     @JoinColumn(name = "scratchie_uid")
     @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ScratchieItem> scratchieItems = new TreeSet<>();
 
     @Column(name = "burning_questions_enabled")
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java	(.../Scribe.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/Scribe.java	(.../Scribe.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -93,7 +93,7 @@
     private Long toolContentId;
 
     @OneToMany(mappedBy = "scribe")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ScribeSession> scribeSessions;
 
     @OneToMany(mappedBy = "scribe", cascade = CascadeType.ALL, orphanRemoval = true)
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/Survey.java	(.../Survey.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -116,13 +116,13 @@
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "survey_uid")
     @OrderBy("sequence_id")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<SurveyQuestion> questions = new HashSet<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "content_uid")
     @SortComparator(TextSearchConditionComparator.class)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<SurveyCondition> conditions = new TreeSet<>(new TextSearchConditionComparator());
 
     public static Survey newInstance(Survey defaultContent, Long contentId) {
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/model/SurveyQuestion.java	(.../SurveyQuestion.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -84,7 +84,7 @@
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
     @JoinColumn(name = "question_uid")
     @OrderBy("sequence_id")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<SurveyOption> options = new HashSet<SurveyOption>();
 
     @Column(name = "create_date")
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -102,7 +102,7 @@
     @OneToMany(cascade = CascadeType.ALL)
     @OrderBy("sequence_id ASC")
     @JoinColumn(name = "taskList_uid")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<TaskListCondition> conditions = new HashSet<TaskListCondition>();
 
     @Column(name = "create_date")
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteContent.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteContent.java	(.../VoteContent.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/model/VoteContent.java	(.../VoteContent.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -108,11 +108,11 @@
 
     @OneToMany(mappedBy = "voteContent", cascade = CascadeType.ALL, orphanRemoval = true)
     @OrderBy("displayOrder")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<VoteQueContent> voteQueContents;
 
     @OneToMany(mappedBy = "voteContent", cascade = CascadeType.ALL, orphanRemoval = true)
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<VoteSession> voteSessions;
 
     @Column(name = "submission_deadline")
Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
===================================================================
diff -u -r8b791fe7643a5b70d30a4d395d0d2159bc6a7b29 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a
--- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 8b791fe7643a5b70d30a4d395d0d2159bc6a7b29)
+++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java	(.../Zoom.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
@@ -104,7 +104,7 @@
     private String meetingPassword;
 
     @OneToMany(mappedBy = "zoom")
-    @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+    // @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
     private Set<ZoomSession> zoomSessions;
 
     public Long getUid() {