diff --git a/androidApp/src/androidMain/AndroidManifest.xml b/androidApp/src/androidMain/AndroidManifest.xml
index 9041c5d..fdcd1b6 100644
--- a/androidApp/src/androidMain/AndroidManifest.xml
+++ b/androidApp/src/androidMain/AndroidManifest.xml
@@ -10,6 +10,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:largeHeap="true"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity
             android:exported="true"
diff --git a/shared/src/androidMain/kotlin/com/kevinschildhorn/fotopresenter/KoinAndroid.kt b/shared/src/androidMain/kotlin/com/kevinschildhorn/fotopresenter/KoinAndroid.kt
index 1397337..47c9013 100644
--- a/shared/src/androidMain/kotlin/com/kevinschildhorn/fotopresenter/KoinAndroid.kt
+++ b/shared/src/androidMain/kotlin/com/kevinschildhorn/fotopresenter/KoinAndroid.kt
@@ -6,11 +6,16 @@ import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
 import app.cash.sqldelight.db.SqlDriver
 import co.touchlab.kermit.Logger
+import co.touchlab.kermit.koin.getLoggerWithTag
 import co.touchlab.kermit.koin.kermitLoggerModule
 import com.kevinschildhorn.fotopresenter.data.datasources.CredentialsDataSource
 import com.kevinschildhorn.fotopresenter.data.network.NetworkHandler
 import com.kevinschildhorn.fotopresenter.data.network.SMBJHandler
+import com.kevinschildhorn.fotopresenter.extension.LoggerTagSuffix
+import com.kevinschildhorn.fotopresenter.ui.shared.CacheInterface
 import com.kevinschildhorn.fotopresenter.ui.shared.DriverFactory
+import com.kevinschildhorn.fotopresenter.ui.shared.SharedFileCache
+import com.kevinschildhorn.fotopresenter.ui.shared.SharedInMemoryCache
 import com.russhwolf.settings.Settings
 import com.russhwolf.settings.SharedPreferencesSettings
 import org.koin.core.KoinApplication
@@ -53,6 +58,11 @@ internal actual val platformModule: Module =
             SMBJHandler
         }
         single<SqlDriver> { DriverFactory(context = get()).createDriver() }
+        /*
+        single<CacheInterface> {
+            val context: Context = get()
+            SharedFileCache(context.filesDir.path, getLoggerWithTag("SharedFileCache$LoggerTagSuffix"))
+        }*/
     }
 
 @OptIn(KoinInternalApi::class)
diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt
index 788b31c..e3dcc69 100644
--- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt
+++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/Koin.kt
@@ -47,11 +47,7 @@ val commonModule =
         single { PlaylistRepository(get(), get(), getLoggerWithTag("PlaylistRepository$LoggerTagSuffix")) }
         factory { ImageMetadataDataSource(getLoggerWithTag("ImageMetadataDataSource$LoggerTagSuffix"), get()) }
         single { ImageRepository(get(), get(), getLoggerWithTag("ImageRepository$LoggerTagSuffix")) }
-        single<CacheInterface> {
-            //val context: Context = get()
-            //SharedFileCache(context.filesDir.path, getLoggerWithTag("SharedFileCache$LoggerTagSuffix"))
-            SharedInMemoryCache
-        }
+        single<CacheInterface> { SharedInMemoryCache }
 
         // Domain
         factory { ConnectToServerUseCase(get(), getLoggerWithTag("ConnectToServerUseCase$LoggerTagSuffix")) }
diff --git a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/composables/LoadingAsyncImage.kt b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/composables/LoadingAsyncImage.kt
index 1dac059..9b4730f 100644
--- a/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/composables/LoadingAsyncImage.kt
+++ b/shared/src/commonMain/kotlin/com/kevinschildhorn/fotopresenter/ui/composables/LoadingAsyncImage.kt
@@ -36,6 +36,7 @@ fun LoadingAsyncImage(
         modifier = modifier,
         onLoading = { loading = true },
         onSuccess = { loading = false },
+        onError = { loading = false },
         error = painterResource(Res.drawable.error),
     )
     if (loading) {