diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 645d17f818..a637f52a86 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -29,6 +29,7 @@ namespace OCA\Encryption\Crypto;
 
 
 use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\View;
 use OCA\Encryption\Exceptions\PublicKeyMissingException;
 use OCA\Encryption\Session;
 use OCA\Encryption\Util;
@@ -186,7 +187,7 @@ class Encryption implements IEncryptionModule {
 			$this->fileKey = $this->keyManager->getFileKey($this->path, $this->user);
 		}
 
-		$this->version = (int)$this->keyManager->getVersion($this->realPath);
+		$this->version = (int)$this->keyManager->getVersion($this->realPath, new View());
 
 		if (
 			$mode === 'w'
@@ -235,7 +236,7 @@ class Encryption implements IEncryptionModule {
 			} else {
 				$version = $this->version + 1;
 			}
-			$this->keyManager->setVersion($this->path, $this->version+1);
+			$this->keyManager->setVersion($this->path, $this->version+1, new View());
 			if (!empty($this->writeCache)) {
 				$result = $this->crypt->symmetricEncryptFileContent($this->writeCache, $this->fileKey, $version, $position);
 				$this->writeCache = '';
@@ -371,7 +372,7 @@ class Encryption implements IEncryptionModule {
 		if(empty($this->realPath)) {
 			$this->realPath = $path;
 		}
-		$version = $this->keyManager->getVersion($this->realPath);
+		$version = $this->keyManager->getVersion($this->realPath, new View());
 
 		if (!empty($fileKey)) {
 
@@ -392,7 +393,7 @@ class Encryption implements IEncryptionModule {
 
 			$this->keyManager->setAllFileKeys($path, $encryptedFileKey);
 
-			$this->keyManager->setVersion($path, $version);
+			$this->keyManager->setVersion($path, $version, new View());
 
 		} else {
 			$this->logger->debug('no file key found, we assume that the file "{file}" is not encrypted',
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 7d8bd8485e..57a8155e7b 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -418,10 +418,10 @@ class KeyManager {
 	 * Get the current version of a file
 	 *
 	 * @param string $path
+	 * @param View $view
 	 * @return int
 	 */
-	public function getVersion($path) {
-		$view = new \OC\Files\View();
+	public function getVersion($path, View $view) {
 		$fileInfo = $view->getFileInfo($path);
 		if($fileInfo === false) {
 			return 0;
@@ -433,19 +433,15 @@ class KeyManager {
 	 * Set the current version of a file
 	 *
 	 * @param string $path
-	 * @param string $version
+	 * @param int $version
+	 * @param View $view
 	 */
-	public function setVersion($path, $version) {
-		$view = new \OC\Files\View();
+	public function setVersion($path, $version, View $view) {
 		$fileInfo= $view->getFileInfo($path);
 
 		if($fileInfo !== false) {
-			$fileId = $fileInfo->getId();
-			$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
-			$qb->update('filecache')
-				->set('encrypted', $qb->createNamedParameter($version))
-				->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
-				->execute();
+			$cache = $fileInfo->getStorage()->getCache();
+			$cache->put($path, ['fileid' => $fileInfo->getId(), 'encrypted' => $version, 'encryptedVersion' => $version]);
 		}
 	}
 
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index c69610fb54..a8cb2dcc78 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -579,4 +579,31 @@ class KeyManagerTest extends TestCase {
 		];
 	}
 
+	public function testGetVersionWithoutFileInfo() {
+		$view = $this->getMockBuilder('\\OC\\Files\\View')
+			->disableOriginalConstructor()->getMock();
+		$view->expects($this->once())
+			->method('getFileInfo')
+			->with('/admin/files/myfile.txt')
+			->willReturn(false);
+
+		$this->assertSame(0, $this->instance->getVersion('/admin/files/myfile.txt', $view));
+	}
+
+	public function testGetVersionWithFileInfo() {
+		$view = $this->getMockBuilder('\\OC\\Files\\View')
+			->disableOriginalConstructor()->getMock();
+		$fileInfo = $this->getMockBuilder('\\OC\\Files\\FileInfo')
+			->disableOriginalConstructor()->getMock();
+		$fileInfo->expects($this->once())
+			->method('getEncryptedVersion')
+			->willReturn(1337);
+		$view->expects($this->once())
+			->method('getFileInfo')
+			->with('/admin/files/myfile.txt')
+			->willReturn($fileInfo);
+
+		$this->assertSame(1337, $this->instance->getVersion('/admin/files/myfile.txt', $view));
+	}
+
 }