diff --git a/app/src/main/java/org/tasks/Tasks.kt b/app/src/main/java/org/tasks/Tasks.kt
index 71ea93d4b..06923049b 100644
--- a/app/src/main/java/org/tasks/Tasks.kt
+++ b/app/src/main/java/org/tasks/Tasks.kt
@@ -13,8 +13,6 @@ import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.coroutineScope
 import androidx.work.Configuration
 import com.mikepenz.iconics.Iconics
-import org.tasks.icons.OutlinedGoogleMaterial
-import org.tasks.icons.OutlinedGoogleMaterial2
 import com.todoroo.astrid.service.Upgrader
 import dagger.Lazy
 import dagger.hilt.android.HiltAndroidApp
@@ -24,7 +22,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.tasks.billing.Inventory
 import org.tasks.caldav.CaldavSynchronizer
-import org.tasks.files.FileHelper
+import org.tasks.icons.OutlinedGoogleMaterial
+import org.tasks.icons.OutlinedGoogleMaterial2
 import org.tasks.injection.InjectingJobIntentService
 import org.tasks.jobs.WorkManager
 import org.tasks.location.GeofenceApi
@@ -108,7 +107,6 @@ class Tasks : Application(), Configuration.Provider {
         }
         OpenTaskContentObserver.registerObserver(context, contentObserver.get())
         geofenceApi.get().registerAll()
-        FileHelper.delete(context, preferences.cacheDirectory)
         appWidgetManager.get().reconfigureWidgets()
         CaldavSynchronizer.registerFactories()
     }
diff --git a/app/src/main/java/org/tasks/activities/CameraActivity.java b/app/src/main/java/org/tasks/activities/CameraActivity.java
index 432569cbb..410bc8d60 100644
--- a/app/src/main/java/org/tasks/activities/CameraActivity.java
+++ b/app/src/main/java/org/tasks/activities/CameraActivity.java
@@ -13,22 +13,15 @@ import androidx.core.content.FileProvider;
 import com.todoroo.astrid.utility.Constants;
 
 import org.tasks.files.FileHelper;
-import org.tasks.preferences.Preferences;
 import org.tasks.time.DateTime;
 
 import java.io.File;
 import java.io.IOException;
 
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-
-@AndroidEntryPoint
 public class CameraActivity extends AppCompatActivity {
 
   private static final int REQUEST_CODE_CAMERA = 75;
   private static final String EXTRA_URI = "extra_output";
-  @Inject Preferences preferences;
 
   private Uri uri;
 
@@ -44,7 +37,7 @@ public class CameraActivity extends AppCompatActivity {
         uri =
             FileHelper.newFile(
                 this,
-                preferences.getCacheDirectory(),
+                Uri.fromFile(getCacheDir()),
                 "image/jpeg",
                 new DateTime().toString("yyyyMMddHHmm"),
                 ".jpeg");
diff --git a/app/src/main/java/org/tasks/files/FileHelper.kt b/app/src/main/java/org/tasks/files/FileHelper.kt
index a844a9654..ffe515c28 100644
--- a/app/src/main/java/org/tasks/files/FileHelper.kt
+++ b/app/src/main/java/org/tasks/files/FileHelper.kt
@@ -144,7 +144,7 @@ object FileHelper {
         val mimeType = getMimeType(context, uri)
         val intent = Intent(Intent.ACTION_VIEW)
         if (uri.scheme == ContentResolver.SCHEME_CONTENT) {
-            uri = copyToUri(context, Uri.fromFile(context.externalCacheDir), uri)
+            uri = copyToUri(context, Uri.fromFile(context.cacheDir), uri)
         }
         val share = FileProvider.getUriForFile(context, Constants.FILE_PROVIDER_AUTHORITY, File(uri.path))
         intent.setDataAndType(share, mimeType)
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt
index bd5b2f489..becad1d3b 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.kt
+++ b/app/src/main/java/org/tasks/preferences/Preferences.kt
@@ -430,15 +430,6 @@ class Preferences @JvmOverloads constructor(
         return if (file.isDirectory || file.mkdirs()) file else null
     }
 
-    val cacheDirectory: Uri
-        get() {
-            var cacheDir = context.externalCacheDir
-            if (cacheDir == null) {
-                cacheDir = context.cacheDir
-            }
-            return DocumentFile.fromFile(cacheDir!!).uri
-        }
-
     private fun hasWritePermission(context: Context, uri: Uri): Boolean =
             (PackageManager.PERMISSION_GRANTED
                     == context.checkUriPermission(
diff --git a/app/src/main/res/xml/file_provider_paths.xml b/app/src/main/res/xml/file_provider_paths.xml
index 8998a339f..0286bfa1b 100644
--- a/app/src/main/res/xml/file_provider_paths.xml
+++ b/app/src/main/res/xml/file_provider_paths.xml
@@ -3,9 +3,6 @@
     <external-path
         name="external"
         path="." />
-    <external-cache-path
-        name="external_cache"
-        path="." />
     <cache-path
       name="internal_cache"
       path="." />