diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index d3e552d5d0e20c781d63cfb9e1bddbf8329bf8a6..becb69a216e46efac16f68cd38977756a72f4434 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -469,7 +469,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
 			File fUnzippedDirRoot = frm.unzipFileResource(session.getTestEntry().getOlatResource());
 			URI assessmentObjectUri = qtiService.createAssessmentTestUri(fUnzippedDirRoot);
 			File submissionDir = qtiService.getAssessmentResultFile(session);
-			String mapperUri = registerCacheableMapper(null, "QTI21CNResults::" + session.getTestEntry().getKey(),
+			String mapperUri = registerCacheableMapper(ureq, "QTI21CNResults::" + session.getTestEntry().getKey(),
 					new ResourcesMapper(assessmentObjectUri, submissionDir));
 
 			resultCtrl = new AssessmentResultController(ureq, getWindowControl(), getIdentity(), true, session,
diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentItemDisplayController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentItemDisplayController.java
index 505b752c70adca18576ca53a39c7aad6aab26faa..c658fd6b07c3e55fb003df3d9675f1edb0e07fe6 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentItemDisplayController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentItemDisplayController.java
@@ -131,7 +131,7 @@ public class AssessmentItemDisplayController extends BasicController implements
 		currentRequestTimestamp = ureq.getRequestTimestamp();
 		candidateSession = qtiService.createInMemoryAssessmentTestSession(getIdentity());
 		submissionDirToDispose = qtiService.getSubmissionDirectory(candidateSession);
-		mapperUri = registerCacheableMapper(null, UUID.randomUUID().toString(), new ResourcesMapper(itemFileRef.toURI(), submissionDirToDispose));
+		mapperUri = registerCacheableMapper(ureq, UUID.randomUUID().toString(), new ResourcesMapper(itemFileRef.toURI(), submissionDirToDispose));
 		
 		itemSessionController = enterSession(ureq);
 		
@@ -159,7 +159,7 @@ public class AssessmentItemDisplayController extends BasicController implements
 		currentRequestTimestamp = ureq.getRequestTimestamp();
 		candidateSession = qtiService.createInMemoryAssessmentTestSession(getIdentity());
 		submissionDirToDispose = qtiService.getSubmissionDirectory(candidateSession);
-		mapperUri = registerCacheableMapper(null, UUID.randomUUID().toString(), new ResourcesMapper(itemFileRef.toURI(), submissionDirToDispose));
+		mapperUri = registerCacheableMapper(ureq, UUID.randomUUID().toString(), new ResourcesMapper(itemFileRef.toURI(), submissionDirToDispose));
 		
 		itemSessionController = enterSession(ureq);
 		
@@ -189,7 +189,7 @@ public class AssessmentItemDisplayController extends BasicController implements
 		currentRequestTimestamp = ureq.getRequestTimestamp();
 		candidateSession = qtiService.createAssessmentTestSession(getIdentity(), null, assessmentEntry, testEntry, itemRef.getIdentifier().toString(), testEntry, authorMode);
 		File submissionDir = qtiService.getSubmissionDirectory(candidateSession);
-		mapperUri = registerCacheableMapper(null, UUID.randomUUID().toString(), new ResourcesMapper(itemFileRef.toURI(), submissionDir));
+		mapperUri = registerCacheableMapper(ureq, UUID.randomUUID().toString(), new ResourcesMapper(itemFileRef.toURI(), submissionDir));
 		
 		itemSessionController = enterSession(ureq);
 		
diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
index 060e608bfcef10e606c526f2c60b0bf97a53a6cb..e6abf96a037c95bcd875ae28e27895a6a6a6aa28 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentResultController.java
@@ -165,7 +165,7 @@ public class AssessmentResultController extends FormBasicController {
 			if (exportUri != null) {
 				signatureMapperUri = exportUri;
 			} else {
-				signatureMapperUri = registerCacheableMapper(null, "QTI21Signature::" + CodeHelper.getForeverUniqueID(),
+				signatureMapperUri = registerCacheableMapper(ureq, "QTI21Signature::" + CodeHelper.getForeverUniqueID(),
 						new SignatureMapper(signature));
 			}
 		}
diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
index 0e0773c5e0ee91dc4b6d508b959b444c2ce18621..9056af8c81b7fd82d6e2051254af08296d9533be 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
@@ -252,7 +252,7 @@ public class AssessmentTestDisplayController extends BasicController implements
 			
 			URI assessmentObjectUri = qtiService.createAssessmentTestUri(fUnzippedDirRoot);
 			File submissionDir = qtiService.getSubmissionDirectory(candidateSession);
-			mapperUri = registerCacheableMapper(null, "QTI21Resources::" + testEntry.getKey(),
+			mapperUri = registerCacheableMapper(ureq, "QTI21Resources::" + testEntry.getKey(),
 					new ResourcesMapper(assessmentObjectUri, submissionDir));
 	
 			/* Handle immediate end of test session */
diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
index eb1c9f62ae379b5c765ee1b0652dc81880e5f4a8..eacc237a5acc0fe90e70cf4e99fc3e2a65480036 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java
@@ -407,7 +407,7 @@ public class QTI21AssessmentDetailsController extends FormBasicController {
 		File fUnzippedDirRoot = frm.unzipFileResource(session.getTestEntry().getOlatResource());
 		URI assessmentObjectUri = qtiService.createAssessmentTestUri(fUnzippedDirRoot);
 		File submissionDir = qtiService.getSubmissionDirectory(session);
-		String mapperUri = registerCacheableMapper(null, "QTI21DetailsResources::" + session.getKey(),
+		String mapperUri = registerCacheableMapper(ureq, "QTI21DetailsResources::" + session.getKey(),
 				new ResourcesMapper(assessmentObjectUri, submissionDir));
 		
 		resultCtrl = new AssessmentResultController(ureq, getWindowControl(), assessedIdentity, false, session,