diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index ec216264429..7f19261d972 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -76,6 +76,9 @@ class Scanner {
 			}
 			if ($checkExisting and $data['size'] === -1 and $cacheData = $this->cache->get($file)) {
 				$data['size'] = $cacheData['size'];
+				if ($data['mtime'] === $cacheData['mtime']) {
+					$data['etag'] = $cacheData['etag'];
+				}
 			}
 			$this->cache->put($file, $data);
 		}