diff --git a/flutter_client/lib/cache/prefetcher.dart b/flutter_client/lib/cache/prefetcher.dart
index 12cbc2ea..0321ab87 100644
--- a/flutter_client/lib/cache/prefetcher.dart
+++ b/flutter_client/lib/cache/prefetcher.dart
@@ -18,18 +18,18 @@ class Prefetcher {
     // The mediaItem stream changes whenever the active track changes
     // (skipNext/skipPrev or natural progression). Settings changes (e.g.
     // operator bumps prefetch window) also trigger a reconcile.
-    _ref.listen<AsyncValue<MediaItem?>>(mediaItemProvider, (_, _) => _reconcile());
-    _ref.listen<AsyncValue<CacheSettings>>(cacheSettingsProvider, (_, _) => _reconcile());
+    _ref.listen<AsyncValue<MediaItem?>>(mediaItemProvider, (_, __) => _reconcile());
+    _ref.listen<AsyncValue<CacheSettings>>(cacheSettingsProvider, (_, __) => _reconcile());
   }
 
   final Ref _ref;
 
   Future<void> _reconcile() async {
-    final settings = _ref.read(cacheSettingsProvider).valueOrNull;
+    final settings = _ref.read(cacheSettingsProvider).value;
     if (settings == null) return;
 
-    final queue = _ref.read(queueProvider).valueOrNull ?? const <MediaItem>[];
-    final current = _ref.read(mediaItemProvider).valueOrNull;
+    final queue = _ref.read(queueProvider).value ?? const <MediaItem>[];
+    final current = _ref.read(mediaItemProvider).value;
     if (queue.isEmpty || current == null) return;
 
     final currentIdx = queue.indexWhere((m) => m.id == current.id);
diff --git a/flutter_client/lib/cache/sync_controller.dart b/flutter_client/lib/cache/sync_controller.dart
index c58c4e1e..9484365f 100644
--- a/flutter_client/lib/cache/sync_controller.dart
+++ b/flutter_client/lib/cache/sync_controller.dart
@@ -19,7 +19,7 @@ class SyncResult {
 }
 
 /// Drives the delta-sync against the server (#357 Plan A endpoint).
-/// Reads cursor from drift, calls /api/library/sync?since=<cursor>,
+/// Reads cursor from drift, calls `/api/library/sync?since={cursor}`,
 /// applies upserts + deletes, advances cursor.
 class SyncController extends AsyncNotifier<SyncResult?> {
   @override
@@ -55,16 +55,12 @@ class SyncController extends AsyncNotifier<SyncResult?> {
       // local state and retry once with cursor=0.
       if (resp.statusCode == 410) {
         await db.transaction(() async {
-          for (final t in [
-            db.cachedArtists,
-            db.cachedAlbums,
-            db.cachedTracks,
-            db.cachedLikes,
-            db.cachedPlaylists,
-            db.cachedPlaylistTracks,
-          ]) {
-            await db.delete(t).go();
-          }
+          await db.delete(db.cachedArtists).go();
+          await db.delete(db.cachedAlbums).go();
+          await db.delete(db.cachedTracks).go();
+          await db.delete(db.cachedLikes).go();
+          await db.delete(db.cachedPlaylists).go();
+          await db.delete(db.cachedPlaylistTracks).go();
           await db.into(db.syncMetadata).insertOnConflictUpdate(
                 SyncMetadataCompanion.insert(cursor: const drift.Value(0)),
               );
diff --git a/flutter_client/lib/player/audio_handler.dart b/flutter_client/lib/player/audio_handler.dart
index 732bfdaa..d1ecfefe 100644
--- a/flutter_client/lib/player/audio_handler.dart
+++ b/flutter_client/lib/player/audio_handler.dart
@@ -114,6 +114,7 @@ class MinstrelAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandl
       final cacheFile = File('${cacheDir.path}/audio_cache/${t.id}.mp3');
       debugPrint('audio_handler: cache miss for track.id=${t.id}, '
           'using LockCachingAudioSource → ${cacheFile.path}');
+      // ignore: experimental_member_use
       return LockCachingAudioSource(parsed,
           headers: headers, cacheFile: cacheFile);
     }
diff --git a/flutter_client/test/cache/audio_cache_manager_test.dart b/flutter_client/test/cache/audio_cache_manager_test.dart
index 06f2cdee..fabd9326 100644
--- a/flutter_client/test/cache/audio_cache_manager_test.dart
+++ b/flutter_client/test/cache/audio_cache_manager_test.dart
@@ -31,12 +31,20 @@ void main() {
       dioFactory: () async => Dio(),
       cacheDirFactory: () async => tmp,
     );
-    await db.into(db.audioCacheIndex).insertAll([
-      AudioCacheIndexCompanion.insert(
-          trackId: 'a', path: 'p', sizeBytes: 100, source: CacheSource.manual),
-      AudioCacheIndexCompanion.insert(
-          trackId: 'b', path: 'p', sizeBytes: 250, source: CacheSource.incidental),
-    ]);
+    await db.batch((b) {
+      b.insertAll(db.audioCacheIndex, [
+        AudioCacheIndexCompanion.insert(
+            trackId: 'a',
+            path: 'p',
+            sizeBytes: 100,
+            source: CacheSource.manual),
+        AudioCacheIndexCompanion.insert(
+            trackId: 'b',
+            path: 'p',
+            sizeBytes: 250,
+            source: CacheSource.incidental),
+      ]);
+    });
     expect(await mgr.usageBytes(), 350);
   });
 
@@ -55,18 +63,20 @@ void main() {
     final f2 = File('${tmp.path}/audio_cache/man.mp3');
     await f2.create(recursive: true);
     await f2.writeAsBytes(List.filled(100, 0));
-    await db.into(db.audioCacheIndex).insertAll([
-      AudioCacheIndexCompanion.insert(
-          trackId: 'inc',
-          path: f1.path,
-          sizeBytes: 100,
-          source: CacheSource.incidental),
-      AudioCacheIndexCompanion.insert(
-          trackId: 'man',
-          path: f2.path,
-          sizeBytes: 100,
-          source: CacheSource.manual),
-    ]);
+    await db.batch((b) {
+      b.insertAll(db.audioCacheIndex, [
+        AudioCacheIndexCompanion.insert(
+            trackId: 'inc',
+            path: f1.path,
+            sizeBytes: 100,
+            source: CacheSource.incidental),
+        AudioCacheIndexCompanion.insert(
+            trackId: 'man',
+            path: f2.path,
+            sizeBytes: 100,
+            source: CacheSource.manual),
+      ]);
+    });
     expect(await mgr.usageBytes(), 200);
     await mgr.evict(targetBytes: 100);
     expect(await mgr.isCached('inc'), false);