diff --git a/.devcontainer/cache/cache.Dockerfile b/.devcontainer/cache/cache.Dockerfile
index 9ef3732fb8d..480019b1617 100644
--- a/.devcontainer/cache/cache.Dockerfile
+++ b/.devcontainer/cache/cache.Dockerfile
@@ -8,9 +8,10 @@ ARG CACHE_FOLDER="/home/${USERNAME}/.devcontainer-cache"
 COPY --chown=${USERNAME}:${USERNAME} . /repo-source-tmp/
 RUN mkdir -p ${CACHE_FOLDER} && chown ${USERNAME} ${CACHE_FOLDER} /repo-source-tmp \
 	&& su ${USERNAME} -c "\
-		.devcontainer/cache/before-cache.sh /repo-source-tmp ${CACHE_FOLDER} \
-		&& .devcontainer/prepare.sh /repo-source-tmp ${CACHE_FOLDER} \
-		&& .devcontainer/cache/cache-diff.sh /repo-source-tmp ${CACHE_FOLDER}"
+		cd /repo-source-tmp \
+		&& .devcontainer/cache/before-cache.sh . ${CACHE_FOLDER} \
+		&& .devcontainer/prepare.sh . ${CACHE_FOLDER} \
+		&& .devcontainer/cache/cache-diff.sh . ${CACHE_FOLDER}"
 
 # This second stage starts fresh and just copies in cache.tar from the previous stage. The related
 # devcontainer.json file is then setup to have postCreateCommand fire restore-diff.sh to expand it.