diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 7a36e88eca3b0..156599e8b4179 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3509,9 +3509,6 @@
       <code>string</code>
       <code>string</code>
     </InvalidReturnType>
-    <NullableReturnStatement occurrences="1">
-      <code>$this-&gt;view-&gt;hash($type, $this-&gt;path, $raw)</code>
-    </NullableReturnStatement>
     <UndefinedThisPropertyAssignment occurrences="1">
       <code>$this-&gt;exists</code>
     </UndefinedThisPropertyAssignment>
diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index 540b6f7b8c309..7183a6c0d2a6d 100644
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -328,7 +328,7 @@ public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEnt
 		if ($rawEntry) {
 			$jailedPath = $this->getJailedPath($rawEntry->getPath());
 			if ($jailedPath !== null) {
-				return $this->formatCacheEntry(clone $rawEntry);
+				return $this->formatCacheEntry(clone $rawEntry) ?: null;
 			}
 		}
 
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index 8b8b4b6af8057..e5300dc75f514 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -60,7 +60,7 @@ protected function getCache() {
 	 * Make it easy for wrappers to modify every returned cache entry
 	 *
 	 * @param ICacheEntry $entry
-	 * @return ICacheEntry
+	 * @return ICacheEntry|false
 	 */
 	protected function formatCacheEntry($entry) {
 		return $entry;
@@ -311,7 +311,8 @@ public function getQueryFilterForStorage(): ISearchOperator {
 	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
 		$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
 		if ($rawEntry) {
-			return $this->formatCacheEntry(clone $rawEntry);
+			$entry = $this->formatCacheEntry(clone $rawEntry);
+			return $entry ?: null;
 		}
 
 		return null;