diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt
index 978a23425..805e088d0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt
@@ -34,7 +34,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 
 class ConnectivityFlow(
-    val context: Context,
+    context: Context,
 ) {
     @OptIn(FlowPreview::class)
     val status =
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityManager.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityManager.kt
index a49b9ca02..5ec4e51ec 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityManager.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityManager.kt
@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service.connectivity
 
-import android.app.Application
+import android.content.Context
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -34,11 +34,11 @@ import kotlinx.coroutines.flow.stateIn
  * Tor will connect as soon as status is listened to.
  */
 class ConnectivityManager(
-    app: Application,
+    context: Context,
     scope: CoroutineScope,
 ) {
     val status: StateFlow<ConnectivityStatus> =
-        ConnectivityFlow(app).status.distinctUntilChanged().stateIn(
+        ConnectivityFlow(context).status.distinctUntilChanged().stateIn(
             scope,
             SharingStarted.WhileSubscribed(30000),
             ConnectivityStatus.Off,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageCacheFactory.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageCacheFactory.kt
index 3fc58d02c..378017d1d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageCacheFactory.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageCacheFactory.kt
@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service.images
 
-import android.app.Application
+import android.content.Context
 import coil3.disk.DiskCache
 import coil3.memory.MemoryCache
 import com.vitorpamplona.amethyst.service.safeCacheDir
@@ -28,7 +28,7 @@ import okio.Path.Companion.toOkioPath
 
 class ImageCacheFactory {
     companion object {
-        fun newDisk(app: Application): DiskCache =
+        fun newDisk(app: Context): DiskCache =
             DiskCache
                 .Builder()
                 .directory(app.safeCacheDir().resolve("image_cache").toOkioPath())
@@ -36,7 +36,7 @@ class ImageCacheFactory {
                 .maximumMaxSizeBytes(1024 * 1024 * 1024) // 1GB
                 .build()
 
-        fun newMemory(app: Application): MemoryCache =
+        fun newMemory(app: Context): MemoryCache =
             MemoryCache
                 .Builder()
                 .maxSizePercent(app)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageLoaderSetup.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageLoaderSetup.kt
index b04fa71fc..e4fae3728 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageLoaderSetup.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/images/ImageLoaderSetup.kt
@@ -20,7 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service.images
 
-import android.app.Application
+import android.content.Context
 import android.os.Build
 import coil3.ImageLoader
 import coil3.SingletonImageLoader
@@ -57,7 +57,7 @@ class ImageLoaderSetup {
 
         @OptIn(DelicateCoilApi::class)
         fun setup(
-            app: Application,
+            app: Context,
             diskCache: DiskCache,
             memoryCache: MemoryCache,
             callFactory: (url: String) -> Call.Factory,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/diskCache/VideoCacheFactory.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/diskCache/VideoCacheFactory.kt
index 86c82701c..c0a571e7e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/diskCache/VideoCacheFactory.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/diskCache/VideoCacheFactory.kt
@@ -20,13 +20,13 @@
  */
 package com.vitorpamplona.amethyst.service.playback.diskCache
 
-import android.app.Application
+import android.content.Context
 import com.vitorpamplona.amethyst.service.safeCacheDir
 import kotlinx.coroutines.runBlocking
 
 class VideoCacheFactory {
     companion object {
-        fun new(app: Application): VideoCache {
+        fun new(app: Context): VideoCache {
             val newCache = VideoCache()
             runBlocking {
                 newCache.initFileCache(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip95/Nip95CacheFactory.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip95/Nip95CacheFactory.kt
index 31910cb74..52d97f0a1 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip95/Nip95CacheFactory.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip95/Nip95CacheFactory.kt
@@ -20,11 +20,11 @@
  */
 package com.vitorpamplona.amethyst.service.uploads.nip95
 
-import android.app.Application
+import android.content.Context
 import com.vitorpamplona.amethyst.service.safeCacheDir
 
 class Nip95CacheFactory {
     companion object {
-        fun new(app: Application) = app.safeCacheDir().resolve("NIP95")
+        fun new(app: Context) = app.safeCacheDir().resolve("NIP95")
     }
 }