diff --git a/app/build.gradle b/app/build.gradle
index 2e421ade..b6b26345 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,6 +88,7 @@ dependencies {
     implementation 'androidx.media3:media3-common:1.3.1'
     implementation 'androidx.media3:media3-exoplayer:1.3.1'
     implementation 'androidx.media3:media3-ui:1.3.1'
+    implementation 'androidx.media3:media3-exoplayer-hls:1.3.1'
     tempoImplementation 'androidx.media3:media3-cast:1.3.1'
 
     annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
index 5b1cc9fe..56297dda 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SettingsFragment.java
@@ -165,7 +165,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
                     long currentSizeMb = DownloadUtil.getStreamingCacheSize(requireActivity()) / (1024 * 1024);
 
-                    return getString(R.string.settings_summary_streaming_cache_size, entry, currentSizeMb);
+                    return getString(R.string.settings_summary_streaming_cache_size, entry, String.valueOf(currentSizeMb));
                 }
             });
         }
diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/DownloadUtil.java b/app/src/main/java/com/cappielloantonio/tempo/util/DownloadUtil.java
index ba803abe..93506b78 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/util/DownloadUtil.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/util/DownloadUtil.java
@@ -80,6 +80,7 @@ public final class DownloadUtil {
     public static synchronized DataSource.Factory getDataSourceFactory(Context context) {
         if (dataSourceFactory == null) {
             context = context.getApplicationContext();
+
             DefaultDataSource.Factory upstreamFactory = new DefaultDataSource.Factory(context, getHttpDataSourceFactory());
 
             if (Preferences.getStreamingCacheSize() > 0) {
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index 29c7250b..1dd0f660 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -83,6 +83,14 @@
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_title_data">
+        <ListPreference
+            app:defaultValue="256"
+            app:dialogTitle="@string/settings_streaming_cache_size"
+            app:entries="@array/streaming_cache_size_titles"
+            app:entryValues="@array/streaming_cache_size_values"
+            app:key="streaming_cache_size"
+            app:title="@string/settings_streaming_cache_size" />
+
         <ListPreference
             app:defaultValue="500"
             app:dialogTitle="@string/settings_covers_cache"
@@ -101,14 +109,6 @@
             app:title="@string/settings_image_size"
             app:useSimpleSummaryProvider="true" />
 
-        <ListPreference
-            app:defaultValue="256"
-            app:dialogTitle="@string/settings_streaming_cache_size"
-            app:entries="@array/streaming_cache_size_titles"
-            app:entryValues="@array/streaming_cache_size_values"
-            app:key="streaming_cache_size"
-            app:title="@string/settings_streaming_cache_size" />
-
         <SwitchPreference
             android:title="@string/settings_wifi_only_title"
             android:defaultValue="false"