diff --git a/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt b/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt
index 243077f1..92404bcb 100644
--- a/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt
+++ b/cache/src/main/kotlin/org/moire/ultrasonic/cache/PermanentFileStorage.kt
@@ -55,9 +55,7 @@ class PermanentFileStorage(
      */
     fun clearAll() {
         val storageDir = getStorageDir()
-        if (storageDir.exists()) {
-            storageDir.listFiles().forEach { if (it.isFile) it.delete() }
-        }
+        storageDir.listFiles().forEach { it.deleteRecursively() }
     }
 
     private fun getFile(name: String) = File(getStorageDir(), "$name.ser")
diff --git a/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt b/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
index 856e6590..d000c562 100644
--- a/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
+++ b/cache/src/test/kotlin/org/moire/ultrasonic/cache/PermanentFileStorageTest.kt
@@ -64,4 +64,11 @@ class PermanentFileStorageTest : BaseStorageTest() {
 
         storageDir.listFiles().size `should equal to` 0
     }
+
+    @Test
+    fun `Should return null if serialized file not available`() {
+        val loadedItem = storage.load("some-name", musicFolderSerializer)
+
+        loadedItem `should equal` null
+    }
 }