diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
index a4fbb2af4d..0b40cd7735 100644
--- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java
@@ -84,7 +84,12 @@ public class SimpleCacheSpanTest extends InstrumentationTestCase {
     File v1File = createTestFile("asd\u00aa.5.6.v1.exo");
 
     for (File file : cacheDir.listFiles()) {
-      SimpleCacheSpan.createCacheEntry(file, index);
+      SimpleCacheSpan cacheEntry = SimpleCacheSpan.createCacheEntry(file, index);
+      if (file.equals(wrongEscapedV2file)) {
+        assertNull(cacheEntry);
+      } else {
+        assertNotNull(cacheEntry);
+      }
     }
 
     assertTrue(v3file.exists());
diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
index 47aefc7820..8c5b7e26e7 100644
--- a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
+++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java
@@ -67,6 +67,7 @@ import java.util.regex.Pattern;
       if (file == null) {
         return null;
       }
+      name = file.getName();
     }
 
     Matcher matcher = CACHE_FILE_PATTERN_V3.matcher(name);