diff --git a/packages/neon/lib/src/apps/news/blocs/articles.dart b/packages/neon/lib/src/apps/news/blocs/articles.dart
index f9a7e237..290cee38 100644
--- a/packages/neon/lib/src/apps/news/blocs/articles.dart
+++ b/packages/neon/lib/src/apps/news/blocs/articles.dart
@@ -125,7 +125,7 @@ class NewsArticlesBloc extends InteractiveBloc implements NewsArticlesBlocEvents
         break;
     }
 
-    await requestManager.wrapNextcloud<List<NextcloudNewsArticle>, NextcloudNewsListArticles>(
+    await requestManager.wrapNextcloud<Iterable<NextcloudNewsArticle>, NextcloudNewsListArticles>(
       client.id,
       'news-articles-${type.code}-$id-$getRead',
       articles,
diff --git a/packages/neon/lib/src/apps/news/blocs/news.dart b/packages/neon/lib/src/apps/news/blocs/news.dart
index 168282c0..e845babc 100644
--- a/packages/neon/lib/src/apps/news/blocs/news.dart
+++ b/packages/neon/lib/src/apps/news/blocs/news.dart
@@ -94,14 +94,14 @@ class NewsBloc extends InteractiveBloc implements NewsBlocEvents, NewsBlocStates
   @override
   Future refresh() async {
     await Future.wait([
-      requestManager.wrapNextcloud<List<NextcloudNewsFolder>, NextcloudNewsListFolders>(
+      requestManager.wrapNextcloud<Iterable<NextcloudNewsFolder>, NextcloudNewsListFolders>(
         client.id,
         'news-folders',
         folders,
         () async => client.news.listFolders(),
         (final response) => response.folders,
       ),
-      requestManager.wrapNextcloud<List<NextcloudNewsFeed>, NextcloudNewsListFeeds>(
+      requestManager.wrapNextcloud<Iterable<NextcloudNewsFeed>, NextcloudNewsListFeeds>(
         client.id,
         'news-feeds',
         feeds,
diff --git a/packages/neon/lib/src/apps/notes/blocs/notes.dart b/packages/neon/lib/src/apps/notes/blocs/notes.dart
index 3674c24e..0874ceb1 100644
--- a/packages/neon/lib/src/apps/notes/blocs/notes.dart
+++ b/packages/neon/lib/src/apps/notes/blocs/notes.dart
@@ -46,7 +46,7 @@ class NotesBloc extends InteractiveBloc implements NotesBlocEvents, NotesBlocSta
 
   @override
   Future refresh() async {
-    await requestManager.wrapNextcloud<List<NextcloudNotesNote>, List<NextcloudNotesNote>>(
+    await requestManager.wrapNextcloud<Iterable<NextcloudNotesNote>, Iterable<NextcloudNotesNote>>(
       client.id,
       'notes-notes',
       notes,
diff --git a/packages/neon/lib/src/apps/notifications/blocs/notifications.dart b/packages/neon/lib/src/apps/notifications/blocs/notifications.dart
index cb75d000..aefb40f8 100644
--- a/packages/neon/lib/src/apps/notifications/blocs/notifications.dart
+++ b/packages/neon/lib/src/apps/notifications/blocs/notifications.dart
@@ -48,7 +48,7 @@ class NotificationsBloc extends InteractiveBloc implements NotificationsBlocEven
   @override
   Future refresh() async {
     await _requestManager
-        .wrapNextcloud<List<NextcloudNotificationsNotification>, NextcloudNotificationsListNotifications>(
+        .wrapNextcloud<Iterable<NextcloudNotificationsNotification>, NextcloudNotificationsListNotifications>(
       _client.id,
       'notifications-notifications',
       notifications,
diff --git a/packages/neon/lib/src/blocs/apps.dart b/packages/neon/lib/src/blocs/apps.dart
index da6b957e..aa99bd25 100644
--- a/packages/neon/lib/src/blocs/apps.dart
+++ b/packages/neon/lib/src/blocs/apps.dart
@@ -115,7 +115,7 @@ class AppsBloc extends InteractiveBloc implements AppsBlocEvents, AppsBlocStates
 
   @override
   Future refresh() async {
-    await _requestManager.wrapNextcloud<List<NextcloudApp>, NextcloudCoreNavigationApps>(
+    await _requestManager.wrapNextcloud<Iterable<NextcloudApp>, NextcloudCoreNavigationApps>(
       _account.client.id,
       'apps-apps',
       apps,
diff --git a/packages/neon/lib/src/utils/request_manager.dart b/packages/neon/lib/src/utils/request_manager.dart
index 8feb6bc6..867cccf2 100644
--- a/packages/neon/lib/src/utils/request_manager.dart
+++ b/packages/neon/lib/src/utils/request_manager.dart
@@ -34,7 +34,7 @@ class RequestManager {
       try {
         subject.add(
           Result(
-            unwrap(deserializeNextcloud<R>(json.decode((await cache!.get(key))!))),
+            unwrap(deserializeNextcloud<R>(json.decode((await cache!.get(key))!) as Object)),
             null,
             loading: true,
             cached: true,
@@ -48,7 +48,7 @@ class RequestManager {
 
     try {
       final response = await (disableTimeout ? call() : timeout(call));
-      await cache?.set(key, json.encode(serializeNextcloud<R>(response)));
+      await cache?.set(key, json.encode(response, toEncodable: serializeNextcloud));
       subject.add(Result.success(unwrap(response)));
     } catch (e, s) {
       debugPrint(e.toString());
@@ -57,7 +57,7 @@ class RequestManager {
         try {
           subject.add(
             Result(
-              unwrap(deserializeNextcloud<R>(json.decode((await cache!.get(key))!))),
+              unwrap(deserializeNextcloud<R>(json.decode((await cache!.get(key))!) as Object)),
               null,
               loading: false,
               cached: true,
diff --git a/packages/neon/pubspec.lock b/packages/neon/pubspec.lock
index 65af0f11..0ded9b8d 100644
--- a/packages/neon/pubspec.lock
+++ b/packages/neon/pubspec.lock
@@ -117,10 +117,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725"
+      sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.3"
+    version: "8.4.4"
   characters:
     dependency: transitive
     description: