diff --git a/lib/Mount/MountProvider.php b/lib/Mount/MountProvider.php
index a88d0a285..c2203cb63 100644
--- a/lib/Mount/MountProvider.php
+++ b/lib/Mount/MountProvider.php
@@ -157,7 +157,7 @@ public function getTrashMount(
 		string $mountPoint,
 		IStorageFactory $loader,
 		?IUser $user,
-		?ICacheEntry $cacheEntry = null,
+		ICacheEntry $cacheEntry,
 	): IMountPoint {
 
 		$storage = $this->folderStorageManager->getBaseStorageForFolder($folder->id, $folder->useSeparateStorage(), $folder, null, false, 'trash');
@@ -181,24 +181,22 @@ public function getVersionsMount(
 		FolderDefinition $folder,
 		string $mountPoint,
 		IStorageFactory $loader,
-		?ICacheEntry $cacheEntry = null,
 	): IMountPoint {
+		$storage = $this->folderStorageManager->getBaseStorageForFolder($folder->id, $folder->useSeparateStorage(), $folder, null, false, 'versions');
+		$cacheEntry = $storage->getCache()->get('');
 		if (!$cacheEntry) {
-			$storage = $this->folderStorageManager->getBaseStorageForFolder($folder->id, $folder->useSeparateStorage(), $folder, null, false, 'versions');
+			$storage->getScanner()->scan('');
 			$cacheEntry = $storage->getCache()->get('');
 			if (!$cacheEntry) {
-				$storage->getScanner()->scan('');
-				$cacheEntry = $storage->getCache()->get('');
-				if (!$cacheEntry) {
-					throw new \Exception('Group folder version root is not in cache even after scanning for folder ' . $folder->id);
-				}
+				throw new \Exception('Group folder version root is not in cache even after scanning for folder ' . $folder->id);
 			}
 		}
 
 		$versionStorage = $this->getGroupFolderStorage(
 			FolderDefinitionWithPermissions::fromFolder($folder, $cacheEntry, Constants::PERMISSION_ALL),
-			null, $cacheEntry,
-			'versions'
+			null,
+			$cacheEntry,
+			'versions',
 		);
 
 		return new GroupMountPoint(
@@ -216,7 +214,7 @@ public function getVersionsMount(
 	public function getGroupFolderStorage(
 		FolderDefinitionWithPermissions $folder,
 		?IUser $user,
-		?ICacheEntry $rootCacheEntry,
+		ICacheEntry $rootCacheEntry,
 		string $type = 'files',
 	): IStorage {
 		if ($user) {
diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php
index c52399572..984abb222 100644
--- a/lib/Trash/TrashBackend.php
+++ b/lib/Trash/TrashBackend.php
@@ -405,6 +405,7 @@ private function setupTrashFolder(FolderDefinitionWithPermissions $folder, ?IUse
 				$mountPoint,
 				$this->storageFactory,
 				$user,
+				$folder->rootCacheEntry,
 			);
 			$this->mountManager->addMount($trashMount);
 		}