diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
index 64893813..a90cf865 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/browsing/BrowsingClient.java
@@ -139,6 +139,5 @@ public class BrowsingClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
-    }
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java
index 323f3082..ea7f7b42 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaannotation/MediaAnnotationClient.java
@@ -74,6 +74,5 @@ public class MediaAnnotationClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
-    }
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java
index 92aa9cb6..fc9318f8 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/medialibraryscanning/MediaLibraryScanningClient.java
@@ -65,6 +65,5 @@ public class MediaLibraryScanningClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
-    }
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
index b238e7e6..512bd1a6 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/mediaretrieval/MediaRetrievalClient.java
@@ -64,6 +64,5 @@ public class MediaRetrievalClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
-    }
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
index f25add4c..45419514 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/playlist/PlaylistClient.java
@@ -81,6 +81,5 @@ public class PlaylistClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
-    }
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
index 1e92d958..5a958ef5 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/searching/SearchingClient.java
@@ -64,6 +64,5 @@ public class SearchingClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
-    }
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;    }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
index 3ef679fa..1fae8058 100644
--- a/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
+++ b/app/src/main/java/com/cappielloantonio/play/subsonic/api/system/SystemClient.java
@@ -64,6 +64,6 @@ public class SystemClient {
 
     private Cache getCache() {
         int cacheSize = 10 * 1024 * 1024;
-        return new Cache(context.getCacheDir(), cacheSize);
+        return context != null ? new Cache(context.getCacheDir(), cacheSize) : null;
     }
 }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
index b8926490..f0361670 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
@@ -118,7 +118,7 @@ public class ArtistPageFragment extends Fragment {
             if (bind != null) bind.bioMoreTextViewClickable.setVisibility(artist.getLastfm() != null ? View.VISIBLE : View.GONE);
 
             CustomGlideRequest.Builder
-                    .from(requireContext(), /*artistPageViewModel.getArtist().getId()*/ null, CustomGlideRequest.ARTIST_PIC, artist.getImageUrl())
+                    .from(requireContext(), artistPageViewModel.getArtist().getId(), CustomGlideRequest.ARTIST_PIC, /*artist.getImageUrl()*/ null)
                     .build()
                     .into(bind.artistBackdropImageView);