diff --git a/lib/private/Files/Filesystem.php b/lib/private/Files/Filesystem.php
index 08621d160b..3d3345a5c8 100644
--- a/lib/private/Files/Filesystem.php
+++ b/lib/private/Files/Filesystem.php
@@ -781,7 +781,7 @@ class Filesystem {
 		 */
 		$path = (string)$path;
 
-		$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath]);
+		$cacheKey = json_encode([$path, $stripTrailingSlash, $isAbsolutePath, $keepUnicode]);
 
 		if (isset(self::$normalizedPathCache[$cacheKey])) {
 			return self::$normalizedPathCache[$cacheKey];
diff --git a/tests/lib/Files/FilesystemTest.php b/tests/lib/Files/FilesystemTest.php
index a4a4345d2f..76e3f47163 100644
--- a/tests/lib/Files/FilesystemTest.php
+++ b/tests/lib/Files/FilesystemTest.php
@@ -92,6 +92,7 @@ class FilesystemTest extends \Test\TestCase {
 		}
 
 		$this->logout();
+		$this->invokePrivate('\OC\Files\Filesystem', 'normalizedPathCache', [null]);
 		parent::tearDown();
 	}
 
@@ -190,6 +191,32 @@ class FilesystemTest extends \Test\TestCase {
 		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash));
 	}
 
+	public function normalizePathKeepUnicodeData() {
+		$nfdName = 'ümlaut';
+		$nfcName = 'ümlaut';
+		return [
+			['/' . $nfcName, $nfcName, true],
+			['/' . $nfcName, $nfcName, false],
+			['/' . $nfdName, $nfdName, true],
+			['/' . $nfcName, $nfdName, false],
+		];
+	}
+
+	/**
+	 * @dataProvider normalizePathKeepUnicodeData
+	 */
+	public function testNormalizePathKeepUnicode($expected, $path, $keepUnicode = false) {
+		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, true, false, $keepUnicode));
+	}
+
+	public function testNormalizePathKeepUnicodeCache() {
+		$nfdName = 'ümlaut';
+		$nfcName = 'ümlaut';
+		// call in succession due to cache
+		$this->assertEquals('/' . $nfcName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, false));
+		$this->assertEquals('/' . $nfdName, \OC\Files\Filesystem::normalizePath($nfdName, true, false, true));
+	}
+
 	public function isValidPathData() {
 		return array(
 			array('/', true),