diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index 66f883e106c5e..3ded20eb495f6 100644
--- a/apps/files_sharing/lib/SharedStorage.php
+++ b/apps/files_sharing/lib/SharedStorage.php
@@ -371,11 +371,6 @@ public function getItemType(): string {
 		return $this->superShare->getNodeType();
 	}
 
-	/**
-	 * @param string $path
-	 * @param null $storage
-	 * @return Cache
-	 */
 	public function getCache($path = '', $storage = null) {
 		if ($this->cache) {
 			return $this->cache;
diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php
index 75f8295caa006..cc317de266918 100644
--- a/lib/private/Files/Storage/Storage.php
+++ b/lib/private/Files/Storage/Storage.php
@@ -37,7 +37,7 @@ interface Storage extends \OCP\Files\Storage {
 	 * get a cache instance for the storage
 	 *
 	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+	 * @param \OC\Files\Storage\Storage|null (optional) the storage to pass to the cache
 	 * @return \OC\Files\Cache\Cache
 	 */
 	public function getCache($path = '', $storage = null);
diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index 4d254b34d4663..65ee6f1181ad7 100644
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -395,7 +395,7 @@ public function hasUpdated($path, $time) {
 	 * get a cache instance for the storage
 	 *
 	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+	 * @param \OC\Files\Storage\Storage|null (optional) the storage to pass to the cache
 	 * @return \OC\Files\Cache\Cache
 	 */
 	public function getCache($path = '', $storage = null) {
diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
index ec1da92f3171d..5faffece67e3a 100644
--- a/lib/private/Files/Storage/Wrapper/Wrapper.php
+++ b/lib/private/Files/Storage/Wrapper/Wrapper.php
@@ -385,7 +385,7 @@ public function hasUpdated($path, $time) {
 	 * get a cache instance for the storage
 	 *
 	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+	 * @param \OC\Files\Storage\Storage|null (optional) the storage to pass to the cache
 	 * @return \OC\Files\Cache\Cache
 	 */
 	public function getCache($path = '', $storage = null) {
diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php
index 8419cc781fcf8..601f293fc16f3 100644
--- a/lib/public/Files/Mount/IMountPoint.php
+++ b/lib/public/Files/Mount/IMountPoint.php
@@ -48,7 +48,7 @@ public function setMountPoint($mountPoint);
 	/**
 	 * Get the storage that is mounted
 	 *
-	 * @return \OC\Files\Storage\Storage|null
+	 * @return \OCP\Files\Storage\IStorage|null
 	 * @since 8.0.0
 	 */
 	public function getStorage();
diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php
index 9f350f92b8611..21272f216c7db 100644
--- a/lib/public/Files/Storage/IStorage.php
+++ b/lib/public/Files/Storage/IStorage.php
@@ -427,10 +427,12 @@ public function setAvailability($isAvailable);
 	public function getOwner($path);
 
 	/**
+	 * @param string $path
+	 * @param IStorage|null $storage
 	 * @return ICache
 	 * @since 9.0.0
 	 */
-	public function getCache();
+	public function getCache($path = '', $storage = null);
 
 	/**
 	 * @return IPropagator