diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 387c91063ba429b21b3872b2886dc0b23ab99cc2..4d46d0c8b1db1d13363a901a6d58d3abc5b66639 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -238,7 +238,7 @@ public class FileBackend {
     }
 
     public static Uri getUriForFile(Context context, File file) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || Config.ONLY_INTERNAL_STORAGE) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N || Config.ONLY_INTERNAL_STORAGE || file.toString().startsWith(context.getCacheDir().toString())) {
             try {
                 return FileProvider.getUriForFile(context, getAuthority(context), file);
             } catch (IllegalArgumentException e) {
diff --git a/src/main/res/xml/file_paths.xml b/src/main/res/xml/file_paths.xml
index 49ea3d170346a92e4099606d110516d289da7cba..af1f19c889f8fe9864c4620d041cad70830b5494 100644
--- a/src/main/res/xml/file_paths.xml
+++ b/src/main/res/xml/file_paths.xml
@@ -21,4 +21,10 @@
     <cache-path
         name="camera"
         path="Camera/"/>
-</paths>
\ No newline at end of file
+    <cache-path
+        name="cache_media"
+        path="media/"/>
+    <cache-path
+        name="avatars"
+        path="avatars/"/>
+</paths>