diff --git a/android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt b/android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt
index a80f71a7..606eab8d 100644
--- a/android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt
+++ b/android/src/main/kotlin/ca/gosyer/jui/android/AppMigrations.kt
@@ -21,7 +21,7 @@ class AppMigrations @Inject constructor(
         if (oldVersion < BuildConfig.VERSION_CODE) {
             migrationPreferences.appVersion().set(BuildConfig.VERSION_CODE)
 
-            UpdateCheckWorker.setupTask(contextWrapper.context)
+            UpdateCheckWorker.setupTask(contextWrapper)
 
             // Fresh install
             if (oldVersion == 0) {
diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/KamelAndroidHandler.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/KamelAndroidHandler.kt
index 6a901542..df08f98d 100644
--- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/KamelAndroidHandler.kt
+++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/KamelAndroidHandler.kt
@@ -12,6 +12,6 @@ import io.kamel.image.config.resourcesFetcher
 import io.kamel.image.config.resourcesIdMapper
 
 actual fun KamelConfigBuilder.kamelPlatformHandler(contextWrapper: ContextWrapper) {
-    resourcesIdMapper(contextWrapper.context)
-    resourcesFetcher(contextWrapper.context)
+    resourcesIdMapper(contextWrapper)
+    resourcesFetcher(contextWrapper)
 }
diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt
index c4296c9f..6c34418f 100644
--- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt
+++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/downloads/AndroidDownloadService.kt
@@ -17,12 +17,11 @@ internal actual fun startDownloadService(
     downloadService: DownloadService,
     actions: WebsocketService.Actions
 ) {
-    val context = contextWrapper.context
     val intent = Intent(
-        context,
+        contextWrapper,
         Class.forName("ca.gosyer.jui.android.data.download.AndroidDownloadService")
     ).apply {
         action = actions.name
     }
-    ContextCompat.startForegroundService(context, intent)
+    ContextCompat.startForegroundService(contextWrapper, intent)
 }
diff --git a/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt
index 191deff2..cac0f71c 100644
--- a/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt
+++ b/ui-core/src/androidMain/kotlin/ca/gosyer/jui/uicore/vm/ContextWrapper.kt
@@ -7,24 +7,25 @@
 package ca.gosyer.jui.uicore.vm
 
 import android.content.Context
+import android.content.ContextWrapper
 import android.widget.Toast
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.desc.desc
 import dev.icerock.moko.resources.format
 import me.tatarka.inject.annotations.Inject
 
-actual class ContextWrapper @Inject constructor(val context: Context) {
+actual class ContextWrapper @Inject constructor(context: Context) : ContextWrapper(context) {
     actual fun toPlatformString(stringResource: StringResource): String {
-        return stringResource.desc().toString(context)
+        return stringResource.desc().toString(this)
     }
 
     actual fun toPlatformString(stringResource: StringResource, vararg args: Any): String {
-        return stringResource.format(*args).toString(context)
+        return stringResource.format(*args).toString(this)
     }
 
     actual fun toast(string: String, length: Length) {
         Toast.makeText(
-            context,
+            this,
             string,
             when (length) {
                 Length.SHORT -> Toast.LENGTH_SHORT