diff --git a/lib/private/Cache/File.php b/lib/private/Cache/File.php
index 74e795cc377..ecff643ed63 100644
--- a/lib/private/Cache/File.php
+++ b/lib/private/Cache/File.php
@@ -29,7 +29,6 @@
  */
 namespace OC\Cache;
 
-use OC\Files\Filesystem;
 use OC\Files\View;
 use OCP\ICache;
 use OCP\Security\ISecureRandom;
@@ -53,7 +52,6 @@ class File implements ICache {
 		if (\OC::$server->getUserSession()->isLoggedIn()) {
 			$rootView = new View();
 			$user = \OC::$server->getUserSession()->getUser();
-			Filesystem::initMountPoints($user->getUID());
 			if (!$rootView->file_exists('/' . $user->getUID() . '/cache')) {
 				$rootView->mkdir('/' . $user->getUID() . '/cache');
 			}
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index 8275eee7b9f..6ee40ae4693 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -95,7 +95,7 @@ class UserMountCache implements IUserMountCache {
 
 		$cachedMounts = $this->getMountsForUser($user);
 		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
+			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts): bool {
 				// for existing mounts that didn't have a mount provider set
 				// we still want the ones that map to new mounts
 				if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getKey()])) {
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
index 7eb284fc774..3ef13f0ab01 100644
--- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -82,6 +82,14 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil
 		if (isset($params['validateWrites'])) {
 			$this->validateWrites = (bool)$params['validateWrites'];
 		}
+
+		// home storage is setup in the SetupManager
+		if (!$this instanceof HomeObjectStoreStorage) {
+			//initialize cache with root directory in cache
+			if (!$this->is_dir('/')) {
+				$this->mkdir('/');
+			}
+		}
 		$this->handleCopiesAsOwned = (bool)($params['handleCopiesAsOwned'] ?? false);
 
 		$this->logger = \OCP\Server::get(LoggerInterface::class);
diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
index 93b7dc37b6b..accb071a814 100644
--- a/lib/private/Files/SetupManager.php
+++ b/lib/private/Files/SetupManager.php
@@ -257,10 +257,21 @@ class SetupManager {
 
 			if ($homeMount->getStorageRootId() === -1) {
 				$this->eventLogger->start('fs:setup:user:home:scan', 'Scan home filesystem for user');
-				$homeMount->getStorage()->mkdir('');
-				$homeMount->getStorage()->getScanner()->scan('');
+				$homeStorage = $homeMount->getStorage();
+				$homeStorage->mkdir('');
+				$homeStorage->mkdir('files');
+				$homeStorage->getScanner()->scan('');
 				$this->eventLogger->end('fs:setup:user:home:scan');
 			}
+
+			$provider = $homeMount->getMountProvider();
+			$this->userMountCache->registerMounts($user, [$homeMount], [$provider]);
+			if (!isset($this->setupUserMountProviders[$user->getUID()])) {
+				$this->setupUserMountProviders[$user->getUID()] = [];
+			}
+			if (!in_array($provider, $this->setupUserMountProviders[$user->getUID()])) {
+				$this->setupUserMountProviders[$user->getUID()][] = $provider;
+			}
 			$this->eventLogger->end('fs:setup:user:home');
 		} else {
 			$this->mountManager->addMount(new MountPoint(