diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
index 89a4ff7ea56cd61581947f2a286e0f727d090c25..0b785287d5d52168a96c99273a8d39fe5eb8fcd1 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/FileStorageHelper.kt
@@ -27,12 +27,10 @@ object FileStorageHelper {
      * Get key files export directory used to store all export files for the transaction
      * Uses FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME constant
      *
-     * TODO Change to CacheDir before release
-     *
      * @return File of key export directory
      */
     val keyExportDirectory = File(
-        CoronaWarnApplication.getAppContext().getExternalFilesDir(null),
+        CoronaWarnApplication.getAppContext().cacheDir,
         FileStorageConstants.KEY_EXPORT_DIRECTORY_NAME
     )
 
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
index e89af1e3b427419deddb3fc0f1bf7f9044cdae8a..92fb647955abfe21cc6ff76add9a8e8afde8986c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/keycache/KeyCacheRepository.kt
@@ -59,7 +59,8 @@ class KeyCacheRepository(private val keyCacheDao: KeyCacheDao) {
     )
 
     suspend fun deleteOutdatedEntries() = keyCacheDao.getAllEntries().forEach {
-        if (File(it.path).isOutdated()) {
+        val file = File(it.path)
+        if (file.isOutdated() || !file.exists()) {
             deleteFileForEntry(it)
             keyCacheDao.deleteEntry(it)
         }