diff --git a/dist/cloud-runner/handleCaching.sh b/dist/cloud-runner/handleCaching.sh
index 81933ad9..a26140dc 100755
--- a/dist/cloud-runner/handleCaching.sh
+++ b/dist/cloud-runner/handleCaching.sh
@@ -24,11 +24,10 @@ fi
 ls -lh "$libraryCacheFolder"
 latestLibraryCacheFile=$(ls -t "$libraryCacheFolder" | grep .zip$ | head -1)
 
-echo "Checking if $libraryCacheFolder/$latestLibraryCacheFile $libraryFolderFull"
+echo "Checking if Library cache $libraryCacheFolder/$latestLibraryCacheFile exists"
 if [ -f "$libraryCacheFolder/$latestLibraryCacheFile" ]; then
-  echo "Library cache exists $"
-  mkdir -p "$libraryFolderFull"
-  unzip -q "$libraryCacheFolder/$latestLibraryCacheFile" -d "$libraryFolderFull"
+  echo "Library cache exists"
+  unzip -q "$libraryCacheFolder/$latestLibraryCacheFile" -d "$libraryFolderFull/.."
   tree "$libraryFolderFull"
 fi
 
@@ -49,8 +48,7 @@ fi
 if [ ! -f "$lfsCacheFolder/$latestLFSCacheFile" ]; then
   echo "LFS cache exists from build $latestLFSCacheFile from $branch"
   rm -r "$gitLFSDestinationFolder"
-  mkdir -p "$gitLFSDestinationFolder"
-  unzip -q "$lfsCacheFolder/$latestLFSCacheFile" -d "$gitLFSDestinationFolder"
+  unzip -q "$lfsCacheFolder/$latestLFSCacheFile" -d "$gitLFSDestinationFolder/.."
   echo "git LFS folder, (should not contain $latestLFSCacheFile)"
   ls -lh "$gitLFSDestinationFolder/"
 fi