diff --git a/lib/files/view.php b/lib/files/view.php
index 994dbcc85c..6d917bb585 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -728,7 +728,7 @@ class View {
 		if ($storage) {
 			$cache = $storage->getCache();
 
-			if (!$cache->inCache($internalPath)) {
+			if ($cache->getStatus($internalPath) < Cache\Cache::COMPLETE) {
 				$scanner = $storage->getScanner();
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 			} else {
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 1b8f6dc1e8..712166ab32 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -97,6 +97,19 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), $rootView->getDirectoryContent('/non/existing'));
 	}
 
+	function testCacheIncompleteFolder() {
+		$storage1 = $this->getTestStorage(false);
+		\OC\Files\Filesystem::mount($storage1, array(), '/');
+		$rootView = new \OC\Files\View('');
+
+		$entries = $rootView->getDirectoryContent('/');
+		$this->assertEquals(3, count($entries));
+
+		// /folder will already be in the cache but not scanned
+		$entries = $rootView->getDirectoryContent('/folder');
+		$this->assertEquals(1, count($entries));
+	}
+
 	public function testAutoScan() {
 		$storage1 = $this->getTestStorage(false);
 		$storage2 = $this->getTestStorage(false);