Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rcef487db738be5b97de9a572b44ae098b4af34c6 -rfcd3028b8d92289519cc8471428df1deb028477a
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision cef487db738be5b97de9a572b44ae098b4af34c6)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision fcd3028b8d92289519cc8471428df1deb028477a)
@@ -3675,7 +3675,7 @@
 		// are we modifying an existing question or creating a new one
 		if (isModification) {
 		    qbQuestion = oldQbQuestion.clone();
-		    qbService.releaseFromCache(oldQbQuestion);
+		    assessmentDao.releaseFromCache(oldQbQuestion);
 		} else {
 		    qbQuestion = new QbQuestion();
 		    qbQuestion.setQuestionId(qbService.generateNextQuestionId());
@@ -3776,7 +3776,7 @@
 			addToCollection = false;
 		    } else {
 			collectionUUIDs = qbService.getCollectionQuestions(collection.getUid()).stream()
-				.filter(q -> q.getUuid() != null)
+				.peek(q -> qbService.releaseFromCache(q)).filter(q -> q.getUuid() != null)
 				.collect(Collectors.mapping(q -> q.getUuid().toString(), Collectors.toSet()));
 		    }
 		}
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -rcef487db738be5b97de9a572b44ae098b4af34c6 -rfcd3028b8d92289519cc8471428df1deb028477a
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision cef487db738be5b97de9a572b44ae098b4af34c6)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision fcd3028b8d92289519cc8471428df1deb028477a)
@@ -2858,7 +2858,7 @@
 		}
 		collectionUid = privateCollectionUUID;
 	    }
-	    
+
 	    boolean addToCollection = true;
 	    // check if it is the same collection - there is a good chance it is
 	    if (collection == null || collectionUid != collection.getUid()) {
@@ -2867,7 +2867,7 @@
 		    addToCollection = false;
 		} else {
 		    collectionUUIDs = qbService.getCollectionQuestions(collection.getUid()).stream()
-			    .filter(q -> q.getUuid() != null)
+			    .peek(q -> qbService.releaseFromCache(q)).filter(q -> q.getUuid() != null)
 			    .collect(Collectors.mapping(q -> q.getUuid().toString(), Collectors.toSet()));
 		}
 	    }