diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 350f8d7a..d64fa61e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,6 +103,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Cache turborepo for Android
+        id: turbo-cache-android
         uses: actions/cache@v4
         with:
           path: ${{ env.TURBO_CACHE_DIR }}
@@ -144,6 +145,7 @@ jobs:
       - name: Build example for Android
         env:
           JAVA_OPTS: "-XX:MaxHeapSize=6g"
+          TURBO_FORCE: ${{ steps.turbo-cache-android.outputs.cache-hit != 'true' }}
         run: |
           yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
 
@@ -160,6 +162,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Cache turborepo for iOS
+        id: turbo-cache-ios
         uses: actions/cache@v4
         with:
           path: ${{ env.TURBO_CACHE_DIR }}
@@ -208,5 +211,7 @@ jobs:
           key: ${{ steps.cocoapods-cache.outputs.cache-key }}
 
       - name: Build example for iOS
+        env:
+          TURBO_FORCE: ${{ steps.turbo-cache-ios.outputs.cache-hit != 'true' }}
         run: |
           yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
diff --git a/android/src/main/java/com/margelo/nitro/rive/HybridRiveFile.kt b/android/src/main/java/com/margelo/nitro/rive/HybridRiveFile.kt
index a4343bda..b01c9ae9 100644
--- a/android/src/main/java/com/margelo/nitro/rive/HybridRiveFile.kt
+++ b/android/src/main/java/com/margelo/nitro/rive/HybridRiveFile.kt
@@ -69,13 +69,12 @@ class HybridRiveFile : HybridRiveFileSpec() {
     val assetsData = referencedAssets.data ?: return
     val cache = referencedAssetCache ?: return
     val loader = assetLoader ?: return
-    val context = NitroModules.applicationContext ?: return
 
     val loadJobs = mutableListOf<kotlinx.coroutines.Deferred<Unit>>()
 
     for ((key, assetData) in assetsData) {
       val asset = cache[key] ?: continue
-      loadJobs.add(loader.updateAsset(assetData, asset, context))
+      loadJobs.add(loader.updateAsset(assetData, asset))
     }
 
     if (loadJobs.isNotEmpty()) {
diff --git a/android/src/main/java/com/margelo/nitro/rive/HybridViewModelImageProperty.kt b/android/src/main/java/com/margelo/nitro/rive/HybridViewModelImageProperty.kt
index 708ef977..e54f7de3 100644
--- a/android/src/main/java/com/margelo/nitro/rive/HybridViewModelImageProperty.kt
+++ b/android/src/main/java/com/margelo/nitro/rive/HybridViewModelImageProperty.kt
@@ -15,7 +15,7 @@ class HybridViewModelImageProperty(private val viewModelImage: ViewModelImagePro
   }
 
   override fun addListener(onChanged: () -> Unit) {
-    listeners.add(onChanged)
+    listeners.add { _ -> onChanged() }
     ensureValueListenerJob(viewModelImage.valueFlow.map { })
   }
 }
diff --git a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp
index 2dc9871a..4cb7fcfd 100644
--- a/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp
+++ b/nitrogen/generated/android/c++/JHybridViewModelImagePropertySpec.cpp
@@ -16,6 +16,7 @@ namespace margelo::nitro::rive { class HybridRiveImageSpec; }
 #include "JHybridRiveImageSpec.hpp"
 #include <functional>
 #include "JFunc_void.hpp"
+#include <NitroModules/JNICallable.hpp>
 
 namespace margelo::nitro::rive {