diff --git a/packages/firebase_data_connect/firebase_data_connect/generate_proto.sh b/packages/firebase_data_connect/firebase_data_connect/generate_proto.sh
index b8d3232eef71..5b3fc45dcaed 100755
--- a/packages/firebase_data_connect/firebase_data_connect/generate_proto.sh
+++ b/packages/firebase_data_connect/firebase_data_connect/generate_proto.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# Uses dart protoc_plugin version 21.1.2. There are compilation issues with newer plugin versions.
+# https://github.com/google/protobuf.dart/releases/tag/protoc_plugin-v21.1.2
+# Run `pub global activate protoc_plugin 21.1.2`
+
 rm -rf lib/src/generated
 mkdir lib/src/generated
-protoc --dart_out=grpc:lib/src/generated -I./protos/firebase -I./protos/google  connector_service.proto google/protobuf/struct.proto graphql_error.proto --proto_path=./protos
+protoc --dart_out=grpc:lib/src/generated -I./protos/firebase -I./protos/google  connector_service.proto google/protobuf/struct.proto google/protobuf/duration.proto graphql_error.proto graphql_response_extensions.proto --proto_path=./protos
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_manager.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache.dart
similarity index 80%
rename from packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_manager.dart
rename to packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache.dart
index b2cc1506161f..3983df6c5842 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_manager.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache.dart
@@ -50,9 +50,13 @@ class Cache {
   Stream<Set<String>> get impactedQueries => _impactedQueryController.stream;
 
   String _constructCacheIdentifier() {
-    final rawIdentifier =
-        '${_settings.storage}-${dataConnect.app.options.projectId}-${dataConnect.app.name}-${dataConnect.connectorConfig.serviceId}-${dataConnect.connectorConfig.connector}-${dataConnect.connectorConfig.location}-${dataConnect.auth?.currentUser?.uid ?? 'anon'}-${dataConnect.transport.transportOptions.host}';
-    return convertToSha256(rawIdentifier);
+    final rawPrefix =
+        '${_settings.storage}-${dataConnect.app.options.projectId}-${dataConnect.app.name}-${dataConnect.connectorConfig.serviceId}-${dataConnect.connectorConfig.connector}-${dataConnect.connectorConfig.location}-${dataConnect.transport.transportOptions.host}';
+    final prefixSha = convertToSha256(rawPrefix);
+    final rawSuffix = dataConnect.auth?.currentUser?.uid ?? 'anon';
+    final suffixSha = convertToSha256(rawSuffix);
+
+    return '$prefixSha-$suffixSha';
   }
 
   void _initializeProvider() {
@@ -92,23 +96,32 @@ class Cache {
       return;
     }
 
-    final dehydrationResult = await _resultTreeProcessor.dehydrate(
-        queryId, serverResponse.data, _cacheProvider!);
+    final Map<DataConnectPath, PathMetadata> paths =
+        serverResponse.extensions != null
+            ? ExtensionResponse.fromJson(serverResponse.extensions!)
+                .flattenPathMetadata()
+            : {};
+
+    final dehydrationResult = await _resultTreeProcessor.dehydrateResults(
+        queryId, serverResponse.data, _cacheProvider!, paths);
 
     EntityNode rootNode = dehydrationResult.dehydratedTree;
     Map<String, dynamic> dehydratedMap =
         rootNode.toJson(mode: EncodingMode.dehydrated);
 
     // if we have server ttl, that overrides maxAge from cacheSettings
-    Duration ttl =
-        serverResponse.ttl != null ? serverResponse.ttl! : _settings.maxAge;
+    Duration ttl = serverResponse.extensions != null &&
+            serverResponse.extensions!['ttl'] != null
+        ? Duration(seconds: serverResponse.extensions!['ttl'] as int)
+        : (serverResponse.ttl ?? _settings.maxAge);
+
     final resultTree = ResultTree(
         data: dehydratedMap,
         ttl: ttl,
         cachedAt: DateTime.now(),
         lastAccessed: DateTime.now());
 
-    _cacheProvider!.saveResultTree(queryId, resultTree);
+    _cacheProvider!.setResultTree(queryId, resultTree);
 
     Set<String> impactedQueryIds = dehydrationResult.impactedQueryIds;
     impactedQueryIds.remove(queryId); // remove query being cached
@@ -116,7 +129,8 @@ class Cache {
   }
 
   /// Fetches a cached result.
-  Future<Map<String, dynamic>?> get(String queryId, bool allowStale) async {
+  Future<Map<String, dynamic>?> resultTree(
+      String queryId, bool allowStale) async {
     if (_cacheProvider == null) {
       return null;
     }
@@ -137,23 +151,20 @@ class Cache {
       }
 
       resultTree.lastAccessed = DateTime.now();
-      _cacheProvider!.saveResultTree(queryId, resultTree);
+      _cacheProvider!.setResultTree(queryId, resultTree);
 
       EntityNode rootNode =
           EntityNode.fromJson(resultTree.data, _cacheProvider!);
+
       Map<String, dynamic> hydratedJson =
-          rootNode.toJson(); //default mode for toJson is hydrate
+          await _resultTreeProcessor.hydrateResults(rootNode, _cacheProvider!);
+
       return hydratedJson;
     }
 
     return null;
   }
 
-  /// Invalidates the cache.
-  Future<void> invalidate() async {
-    _cacheProvider?.clear();
-  }
-
   void dispose() {
     _impactedQueryController.close();
   }
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_data_types.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_data_types.dart
index ae80c237817a..0768da15232c 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_data_types.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_data_types.dart
@@ -15,41 +15,144 @@
 import 'dart:convert';
 
 import 'package:firebase_data_connect/src/cache/cache_provider.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:firebase_data_connect/src/common/common_library.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart' show kIsWeb, listEquals;
 
 /// Type of storage to use for the cache
 enum CacheStorage { persistent, memory }
 
-const String kGlobalIDKey = 'cacheId';
+const String kGlobalIDKey = 'guid';
+
+@immutable
+class DataConnectPath {
+  final List<DataConnectPathSegment> components;
+
+  DataConnectPath([List<DataConnectPathSegment>? components])
+      : components = components ?? [];
+
+  DataConnectPath appending(DataConnectPathSegment segment) {
+    return DataConnectPath([...components, segment]);
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is DataConnectPath &&
+          runtimeType == other.runtimeType &&
+          listEquals(components, other.components);
+
+  @override
+  int get hashCode => Object.hashAll(components);
+
+  @override
+  String toString() => 'DataConnectPath($components)';
+}
+
+/// Additional information about object / field identified by a path
+class PathMetadata {
+  final DataConnectPath path;
+  final String? entityId;
+
+  PathMetadata({required this.path, this.entityId});
+
+  @override
+  String toString() {
+    return '$path : ${entityId ?? "null"}';
+  }
+}
+
+/// Represents the server response contained within the extension response
+class PathMetadataResponse {
+  final List<DataConnectPathSegment> path;
+  final String? entityId;
+  final List<String>? entityIds;
+
+  PathMetadataResponse({required this.path, this.entityId, this.entityIds});
+
+  factory PathMetadataResponse.fromJson(Map<String, dynamic> json) {
+    return PathMetadataResponse(
+      path: (json['path'] as List).map(_parsePathSegment).toList(),
+      entityId: json['entityId'] as String?,
+      entityIds: (json['entityIds'] as List?)?.cast<String>(),
+    );
+  }
+}
+
+DataConnectPathSegment _parsePathSegment(dynamic segment) {
+  if (segment is String) {
+    return DataConnectFieldPathSegment(segment);
+  } else if (segment is double || segment is int) {
+    int index = (segment is double) ? segment.toInt() : segment;
+    return DataConnectListIndexPathSegment(index);
+  }
+  throw ArgumentError('Invalid path segment type: ${segment.runtimeType}');
+}
+
+/// Represents the extension section within the server response
+class ExtensionResponse {
+  final Duration? maxAge;
+  final List<PathMetadataResponse> dataConnect;
+
+  ExtensionResponse({this.maxAge, required this.dataConnect});
+
+  factory ExtensionResponse.fromJson(Map<String, dynamic> json) {
+    return ExtensionResponse(
+      maxAge:
+          json['ttl'] != null ? Duration(seconds: json['ttl'] as int) : null,
+      dataConnect: (json['dataConnect'] as List?)
+              ?.map((e) =>
+                  PathMetadataResponse.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          [],
+    );
+  }
+
+  Map<DataConnectPath, PathMetadata> flattenPathMetadata() {
+    final Map<DataConnectPath, PathMetadata> result = {};
+    for (final pmr in dataConnect) {
+      if (pmr.entityId != null) {
+        final pm = PathMetadata(
+            path: DataConnectPath(pmr.path), entityId: pmr.entityId);
+        result[pm.path] = pm;
+      }
+
+      if (pmr.entityIds != null) {
+        for (var i = 0; i < pmr.entityIds!.length; i++) {
+          final entityId = pmr.entityIds![i];
+          final indexPath = DataConnectPath(pmr.path)
+              .appending(DataConnectListIndexPathSegment(i));
+          final pm = PathMetadata(path: indexPath, entityId: entityId);
+          result[pm.path] = pm;
+        }
+      }
+    }
+    return result;
+  }
+}
 
 /// Configuration for the cache
 class CacheSettings {
   /// The type of storage to use (e.g., "persistent", "memory")
   final CacheStorage storage;
 
-  /// The maximum size of the cache in bytes
-  final int maxSizeBytes;
-
   /// Duration for which cache is used before revalidation with server
   final Duration maxAge;
 
   // Internal const constructor
   const CacheSettings._internal({
     required this.storage,
-    required this.maxSizeBytes,
     required this.maxAge,
   });
 
   // Factory constructor to handle the logic
   factory CacheSettings({
     CacheStorage? storage,
-    int? maxSizeBytes,
     Duration maxAge = Duration.zero,
   }) {
     return CacheSettings._internal(
       storage:
           storage ?? (kIsWeb ? CacheStorage.memory : CacheStorage.persistent),
-      maxSizeBytes: maxSizeBytes ?? (kIsWeb ? 40000000 : 100000000),
       maxAge: maxAge,
     );
   }
@@ -203,7 +306,7 @@ class EntityNode {
       Map<String, dynamic> json, CacheProvider cacheProvider) {
     EntityDataObject? entity;
     if (json[kGlobalIDKey] != null) {
-      entity = cacheProvider.getEntityDataObject(json[kGlobalIDKey]);
+      entity = cacheProvider.getEntityData(json[kGlobalIDKey]);
     }
 
     Map<String, dynamic>? scalars;
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_provider.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_provider.dart
index 9f65aa127820..484e1e390a45 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_provider.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_provider.dart
@@ -25,19 +25,16 @@ abstract class CacheProvider {
   Future<bool> initialize();
 
   /// Stores a `ResultTree` object.
-  void saveResultTree(String queryId, ResultTree resultTree);
+  void setResultTree(String queryId, ResultTree resultTree);
 
   /// Retrieves a `ResultTree` object.
   ResultTree? getResultTree(String queryId);
 
   /// Stores an `EntityDataObject` object.
-  void saveEntityDataObject(EntityDataObject edo);
+  void updateEntityData(EntityDataObject edo);
 
   /// Retrieves an `EntityDataObject` object.
-  EntityDataObject getEntityDataObject(String guid);
-
-  /// Manages the cache size and eviction policies.
-  void manageCacheSize();
+  EntityDataObject getEntityData(String guid);
 
   /// Clears all data from the cache.
   void clear();
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/in_memory_cache_provider.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/in_memory_cache_provider.dart
index b625921bbe05..cd44d4e25ac5 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/in_memory_cache_provider.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/in_memory_cache_provider.dart
@@ -16,6 +16,7 @@ import 'cache_data_types.dart';
 import 'cache_provider.dart';
 
 /// An in-memory implementation of the `CacheProvider`.
+/// This is used for the web platform
 class InMemoryCacheProvider implements CacheProvider {
   final Map<String, ResultTree> _resultTrees = {};
   final Map<String, EntityDataObject> _edos = {};
@@ -31,12 +32,12 @@ class InMemoryCacheProvider implements CacheProvider {
 
   @override
   Future<bool> initialize() async {
-    // nothing to be intialized.
+    // nothing to be intialized
     return true;
   }
 
   @override
-  void saveResultTree(String queryId, ResultTree resultTree) {
+  void setResultTree(String queryId, ResultTree resultTree) {
     _resultTrees[queryId] = resultTree;
   }
 
@@ -46,20 +47,15 @@ class InMemoryCacheProvider implements CacheProvider {
   }
 
   @override
-  void saveEntityDataObject(EntityDataObject edo) {
+  void updateEntityData(EntityDataObject edo) {
     _edos[edo.guid] = edo;
   }
 
   @override
-  EntityDataObject getEntityDataObject(String guid) {
+  EntityDataObject getEntityData(String guid) {
     return _edos.putIfAbsent(guid, () => EntityDataObject(guid: guid));
   }
 
-  @override
-  void manageCacheSize() {
-    // In-memory cache doesn't have a size limit in this implementation.
-  }
-
   @override
   void clear() {
     _resultTrees.clear();
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/result_tree_processor.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/result_tree_processor.dart
index 34b557c31d71..ce4bf1bad24a 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/result_tree_processor.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/result_tree_processor.dart
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import 'dart:developer' as developer;
+
 import '../common/common_library.dart';
 import 'cache_data_types.dart';
 import 'cache_provider.dart';
@@ -27,76 +29,109 @@ class DehydrationResult {
 class ResultTreeProcessor {
   /// Takes a server response, traverses the data, creates or updates `EntityDataObject`s,
   /// and builds a dehydrated `EntityNode` tree.
-  Future<DehydrationResult> dehydrate(String queryId,
-      Map<String, dynamic> serverResponse, CacheProvider cacheProvider) async {
+  Future<DehydrationResult> dehydrateResults(
+      String queryId,
+      Map<String, dynamic> serverResponse,
+      CacheProvider cacheProvider,
+      Map<DataConnectPath, PathMetadata> paths) async {
     final impactedQueryIds = <String>{};
 
     Map<String, dynamic> jsonData = serverResponse;
     if (serverResponse.containsKey('data')) {
       jsonData = serverResponse['data'];
     }
-    final rootNode =
-        _dehydrateNode(queryId, jsonData, cacheProvider, impactedQueryIds);
+    final rootNode = _dehydrateNode(queryId, jsonData, cacheProvider,
+        impactedQueryIds, DataConnectPath(), paths);
 
     return DehydrationResult(rootNode, impactedQueryIds);
   }
 
-  EntityNode _dehydrateNode(String queryId, dynamic data,
-      CacheProvider cacheProvider, Set<String> impactedQueryIds) {
+  EntityNode _dehydrateNode(
+      String queryId,
+      dynamic data,
+      CacheProvider cacheProvider,
+      Set<String> impactedQueryIds,
+      DataConnectPath path,
+      Map<DataConnectPath, PathMetadata> paths) {
     if (data is Map<String, dynamic>) {
-      // data contains a unique entity id. we can normalize
-      final guid = data[kGlobalIDKey] as String?;
+      // Look up entityId for current path
+      String? guid;
+      if (paths.containsKey(path)) {
+        guid = paths[path]?.entityId;
+      }
 
-      final serverValues = <String, dynamic>{};
+      final scalarValues = <String, dynamic>{}; // scalars
       final nestedObjects = <String, EntityNode>{};
       final nestedObjectLists = <String, List<EntityNode>>{};
 
       for (final entry in data.entries) {
         final key = entry.key;
         final value = entry.value;
-
         if (value is Map<String, dynamic>) {
-          EntityNode en =
-              _dehydrateNode(queryId, value, cacheProvider, impactedQueryIds);
+          //developer.log('detected Map for $key');
+          EntityNode en = _dehydrateNode(
+              queryId,
+              value,
+              cacheProvider,
+              impactedQueryIds,
+              path.appending(DataConnectFieldPathSegment(key)),
+              paths);
           nestedObjects[key] = en;
         } else if (value is List) {
+          //developer.log('detected List for $key');
           final nodeList = <EntityNode>[];
           final scalarValueList = <dynamic>[];
-          for (final item in value) {
+          for (var i = 0; i < value.length; i++) {
+            final item = value[i];
             if (item is Map<String, dynamic>) {
               nodeList.add(_dehydrateNode(
-                  queryId, item, cacheProvider, impactedQueryIds));
+                  queryId,
+                  item,
+                  cacheProvider,
+                  impactedQueryIds,
+                  path
+                      .appending(DataConnectFieldPathSegment(key))
+                      .appending(DataConnectListIndexPathSegment(i)),
+                  paths));
             } else {
               // assuming scalar - we don't handle array of arrays
               scalarValueList.add(item);
             }
           }
-
-          // we either do object lists or scalar lists stored with scalars
-          // we don't handle mixed lists.
-          if (nodeList.isNotEmpty) {
+          // we either normalize object lists or scalar lists stored with scalars
+          // we don't normalize mixed lists. We store them as-is for reconstruction from cache.
+          if (nodeList.isNotEmpty && scalarValueList.isNotEmpty) {
+            // mixed type array - we directly store the json as-is
+            developer
+                .log('detected mixed type array for key $key. storing as-is');
+            scalarValues[key] = value;
+          } else if (nodeList.isNotEmpty) {
             nestedObjectLists[key] = nodeList;
+          } else if (scalarValueList.isNotEmpty) {
+            scalarValues[key] = scalarValueList;
           } else {
-            serverValues[key] = scalarValueList;
+            // we have empty array. save key as scalar since we can't determine type
+            scalarValues[key] = value;
           }
+          // end list handling
         } else {
-          serverValues[key] = value;
+          //developer.log('detected Scalar for $key');
+          scalarValues[key] = value;
         }
       }
 
       if (guid != null) {
-        final existingEdo = cacheProvider.getEntityDataObject(guid);
-        existingEdo.setServerValues(serverValues, queryId);
-        cacheProvider.saveEntityDataObject(existingEdo);
+        final existingEdo = cacheProvider.getEntityData(guid);
+        existingEdo.setServerValues(scalarValues, queryId);
+        cacheProvider.updateEntityData(existingEdo);
         impactedQueryIds.addAll(existingEdo.referencedFrom);
-
         return EntityNode(
             entity: existingEdo,
             nestedObjects: nestedObjects,
             nestedObjectLists: nestedObjectLists);
       } else {
         return EntityNode(
-            scalarValues: serverValues,
+            scalarValues: scalarValues,
             nestedObjects: nestedObjects,
             nestedObjectLists: nestedObjectLists);
       }
@@ -108,40 +143,8 @@ class ResultTreeProcessor {
 
   /// Takes a dehydrated `EntityNode` tree, fetches the corresponding `EntityDataObject`s
   /// from the `CacheProvider`, and reconstructs the original data structure.
-  Future<Map<String, dynamic>> hydrate(
+  Future<Map<String, dynamic>> hydrateResults(
       EntityNode dehydratedTree, CacheProvider cacheProvider) async {
-    return await _hydrateNode(dehydratedTree, cacheProvider)
-        as Map<String, dynamic>;
-  }
-
-  Future<dynamic> _hydrateNode(
-      EntityNode node, CacheProvider cacheProvider) async {
-    final Map<String, dynamic> data = {};
-    if (node.entity != null) {
-      final edo = cacheProvider.getEntityDataObject(node.entity!.guid);
-      data.addAll(edo.fields());
-    }
-
-    if (node.scalarValues != null) {
-      data.addAll(node.scalarValues!);
-    }
-
-    if (node.nestedObjects != null) {
-      for (final entry in node.nestedObjects!.entries) {
-        data[entry.key] = await _hydrateNode(entry.value, cacheProvider);
-      }
-    }
-
-    if (node.nestedObjectLists != null) {
-      for (final entry in node.nestedObjectLists!.entries) {
-        final list = <dynamic>[];
-        for (final item in entry.value) {
-          list.add(await _hydrateNode(item, cacheProvider));
-        }
-        data[entry.key] = list;
-      }
-    }
-
-    return data;
+    return dehydratedTree.toJson(); //default mode for toJson is hydrate
   }
 }
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/sqlite_cache_provider.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/sqlite_cache_provider.dart
index 3de7c1b44c95..1493f32a05ac 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/sqlite_cache_provider.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/cache/sqlite_cache_provider.dart
@@ -39,7 +39,19 @@ class SQLite3CacheProvider implements CacheProvider {
         final path = join(dbPath.path, '$_identifier.db');
         _db = sqlite3.open(path);
       }
-      _createTables();
+
+      int curVersion = _getDatabaseVersion();
+      if (curVersion == 0) {
+        _createTables();
+      } else {
+        int major = curVersion ~/ 1000000;
+        if (major != 1) {
+          developer.log(
+              'Unsupported schema major version $major detected. Expected 1');
+          return false;
+        }
+      }
+
       return true;
     } catch (e) {
       developer.log('Error initializing SQLiteProvider $e');
@@ -47,19 +59,37 @@ class SQLite3CacheProvider implements CacheProvider {
     }
   }
 
+  int _getDatabaseVersion() {
+    final resultSet = _db.select('PRAGMA user_version;');
+    return resultSet.first.columnAt(0) as int;
+  }
+
+  void _setDatabaseVersion(int version) {
+    _db.execute('PRAGMA user_version = $version;');
+  }
+
   void _createTables() {
-    _db.execute('''
-      CREATE TABLE IF NOT EXISTS $resultTreeTable (
-        query_id TEXT PRIMARY KEY,
-        result_tree TEXT
-      );
-    ''');
-    _db.execute('''
-      CREATE TABLE IF NOT EXISTS $entityDataTable (
-        guid TEXT PRIMARY KEY,
-        entity_data_object TEXT
-      );
-    ''');
+    _db.execute('BEGIN TRANSACTION');
+    try {
+      _db.execute('''
+        CREATE TABLE IF NOT EXISTS $resultTreeTable (
+          query_id TEXT PRIMARY KEY NOT NULL,
+          last_accessed REAL NOT NULL,
+          data TEXT NOT NULL
+        );
+      ''');
+      _db.execute('''
+        CREATE TABLE IF NOT EXISTS $entityDataTable (
+          entity_guid TEXT PRIMARY KEY NOT NULL,
+          data TEXT NOT NULL
+        );
+      ''');
+      _setDatabaseVersion(1000000); // 1.0.0
+      _db.execute('COMMIT');
+    } catch (_) {
+      _db.execute('ROLLBACK');
+      rethrow;
+    }
   }
 
   @override
@@ -69,57 +99,84 @@ class SQLite3CacheProvider implements CacheProvider {
 
   @override
   void clear() {
-    _db.execute('DELETE FROM $resultTreeTable');
-    _db.execute('DELETE FROM $entityDataTable');
+    _db.execute('BEGIN TRANSACTION');
+    try {
+      _db.execute('DELETE FROM $resultTreeTable');
+      _db.execute('DELETE FROM $entityDataTable');
+      _db.execute('COMMIT');
+    } catch (_) {
+      _db.execute('ROLLBACK');
+      rethrow;
+    }
   }
 
   @override
-  EntityDataObject getEntityDataObject(String guid) {
+  EntityDataObject getEntityData(String guid) {
     final resultSet = _db.select(
-      'SELECT entity_data_object FROM $entityDataTable WHERE guid = ?',
+      'SELECT data FROM $entityDataTable WHERE entity_guid = ?',
       [guid],
     );
     if (resultSet.isEmpty) {
-      // not found lets create an empty one.
+      // not found lets create an empty one
       EntityDataObject edo = EntityDataObject(guid: guid);
       return edo;
     }
-    return EntityDataObject.fromRawJson(
-        resultSet.first['entity_data_object'] as String);
+    return EntityDataObject.fromRawJson(resultSet.first['data'] as String);
   }
 
   @override
   ResultTree? getResultTree(String queryId) {
     final resultSet = _db.select(
-      'SELECT result_tree FROM $resultTreeTable WHERE query_id = ?',
+      'SELECT data FROM $resultTreeTable WHERE query_id = ?',
       [queryId],
     );
     if (resultSet.isEmpty) {
       return null;
     }
-    return ResultTree.fromRawJson(resultSet.first['result_tree'] as String);
+    _updateLastAccessedTime(queryId);
+    return ResultTree.fromRawJson(resultSet.first['data'] as String);
   }
 
-  @override
-  void manageCacheSize() {
-    // TODO: implement manageCacheSize
+  void _updateLastAccessedTime(String queryId) {
+    _db.execute(
+      'UPDATE $resultTreeTable SET last_accessed = ? WHERE query_id = ?',
+      [DateTime.now().millisecondsSinceEpoch / 1000.0, queryId],
+    );
   }
 
   @override
-  void saveEntityDataObject(EntityDataObject edo) {
+  void updateEntityData(EntityDataObject edo) {
     String rawJson = edo.toRawJson();
-    _db.execute(
-      'INSERT OR REPLACE INTO $entityDataTable (guid, entity_data_object) VALUES (?, ?)',
-      [edo.guid, rawJson],
-    );
+    _db.execute('BEGIN TRANSACTION');
+    try {
+      _db.execute(
+        'INSERT OR REPLACE INTO $entityDataTable (entity_guid, data) VALUES (?, ?)',
+        [edo.guid, rawJson],
+      );
+      _db.execute('COMMIT');
+    } catch (_) {
+      _db.execute('ROLLBACK');
+      rethrow;
+    }
   }
 
   @override
-  void saveResultTree(String queryId, ResultTree resultTree) {
-    _db.execute(
-      'INSERT OR REPLACE INTO $resultTreeTable (query_id, result_tree) VALUES (?, ?)',
-      [queryId, resultTree.toRawJson()],
-    );
+  void setResultTree(String queryId, ResultTree resultTree) {
+    _db.execute('BEGIN TRANSACTION');
+    try {
+      _db.execute(
+        'INSERT OR REPLACE INTO $resultTreeTable (query_id, last_accessed, data) VALUES (?, ?, ?)',
+        [
+          queryId,
+          DateTime.now().millisecondsSinceEpoch / 1000.0,
+          resultTree.toRawJson()
+        ],
+      );
+      _db.execute('COMMIT');
+    } catch (_) {
+      _db.execute('ROLLBACK');
+      rethrow;
+    }
   }
 }
 
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart
index e24e7a7e3b89..9247287f5adf 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/common_library.dart
@@ -61,11 +61,18 @@ class TransportOptions {
   bool? isSecure;
 }
 
+/// Encapsulates the response from server
 class ServerResponse {
+  /// Data returned from server
   final Map<String, dynamic> data;
+
+  /// duration for which the results are considered not stale
   Duration? ttl;
 
-  ServerResponse(this.data);
+  /// Additional data provided in extensions
+  final Map<String, dynamic>? extensions;
+
+  ServerResponse(this.data, {this.extensions});
 }
 
 /// Interface for transports connecting to the DataConnect backend.
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/dataconnect_error.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/dataconnect_error.dart
index 3928a9706536..43b7fd964418 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/common/dataconnect_error.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/common/dataconnect_error.dart
@@ -58,16 +58,43 @@ class DataConnectOperationFailureResponseErrorInfo {
 }
 
 /// Path where error occurred.
+@immutable
 sealed class DataConnectPathSegment {}
 
 class DataConnectFieldPathSegment extends DataConnectPathSegment {
   final String field;
   DataConnectFieldPathSegment(this.field);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is DataConnectFieldPathSegment &&
+          runtimeType == other.runtimeType &&
+          field == other.field;
+
+  @override
+  int get hashCode => field.hashCode;
+
+  @override
+  String toString() => field;
 }
 
 class DataConnectListIndexPathSegment extends DataConnectPathSegment {
   final int index;
   DataConnectListIndexPathSegment(this.index);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is DataConnectListIndexPathSegment &&
+          runtimeType == other.runtimeType &&
+          index == other.index;
+
+  @override
+  int get hashCode => index.hashCode;
+
+  @override
+  String toString() => index.toString();
 }
 
 typedef Serializer<Variables> = String Function(Variables vars);
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/core/ref.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/core/ref.dart
index e23a00134b70..5b359f6a15b3 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/core/ref.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/core/ref.dart
@@ -251,7 +251,7 @@ class QueryRef<Data, Variables> extends OperationRef<Data, Variables> {
     final cacheManager = dataConnect.cacheManager!;
     bool allowStale = fetchPolicy ==
         QueryFetchPolicy.cacheOnly; //if its cache only, we always allow stale
-    final cachedData = await cacheManager.get(_queryId, allowStale);
+    final cachedData = await cacheManager.resultTree(_queryId, allowStale);
 
     if (cachedData != null) {
       try {
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart
index 43cc4fb63e1a..1684e88ed8b8 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/firebase_data_connect.dart
@@ -25,7 +25,7 @@ import './network/transport_library.dart'
     if (dart.library.html) './network/rest_library.dart';
 
 import 'cache/cache_data_types.dart';
-import 'cache/cache_manager.dart';
+import 'cache/cache.dart';
 
 /// DataConnect class
 class FirebaseDataConnect extends FirebasePluginPlatform {
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pb.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pb.dart
index 54aed178ad40..1f38718bd4c9 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pb.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pb.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: connector_service.proto
@@ -27,7 +14,8 @@ import 'dart:core' as $core;
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import 'google/protobuf/struct.pb.dart' as $1;
-import 'graphql_error.pb.dart' as $2;
+import 'graphql_error.pb.dart' as $3;
+import 'graphql_response_extensions.pb.dart' as $4;
 
 /// The ExecuteQuery request to Firebase Data Connect.
 class ExecuteQueryRequest extends $pb.GeneratedMessage {
@@ -257,7 +245,8 @@ class ExecuteMutationRequest extends $pb.GeneratedMessage {
 class ExecuteQueryResponse extends $pb.GeneratedMessage {
   factory ExecuteQueryResponse({
     $1.Struct? data,
-    $core.Iterable<$2.GraphqlError>? errors,
+    $core.Iterable<$3.GraphqlError>? errors,
+    $4.GraphqlResponseExtensions? extensions,
   }) {
     final $result = create();
     if (data != null) {
@@ -266,6 +255,9 @@ class ExecuteQueryResponse extends $pb.GeneratedMessage {
     if (errors != null) {
       $result.errors.addAll(errors);
     }
+    if (extensions != null) {
+      $result.extensions = extensions;
+    }
     return $result;
   }
   ExecuteQueryResponse._() : super();
@@ -283,9 +275,11 @@ class ExecuteQueryResponse extends $pb.GeneratedMessage {
       createEmptyInstance: create)
     ..aOM<$1.Struct>(1, _omitFieldNames ? '' : 'data',
         subBuilder: $1.Struct.create)
-    ..pc<$2.GraphqlError>(
+    ..pc<$3.GraphqlError>(
         2, _omitFieldNames ? '' : 'errors', $pb.PbFieldType.PM,
-        subBuilder: $2.GraphqlError.create)
+        subBuilder: $3.GraphqlError.create)
+    ..aOM<$4.GraphqlResponseExtensions>(3, _omitFieldNames ? '' : 'extensions',
+        subBuilder: $4.GraphqlResponseExtensions.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('Using this can add significant overhead to your binary. '
@@ -329,14 +323,30 @@ class ExecuteQueryResponse extends $pb.GeneratedMessage {
 
   /// Errors of this response.
   @$pb.TagNumber(2)
-  $core.List<$2.GraphqlError> get errors => $_getList(1);
+  $core.List<$3.GraphqlError> get errors => $_getList(1);
+
+  /// Additional response information.
+  @$pb.TagNumber(3)
+  $4.GraphqlResponseExtensions get extensions => $_getN(2);
+  @$pb.TagNumber(3)
+  set extensions($4.GraphqlResponseExtensions v) {
+    setField(3, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasExtensions() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearExtensions() => clearField(3);
+  @$pb.TagNumber(3)
+  $4.GraphqlResponseExtensions ensureExtensions() => $_ensure(2);
 }
 
 /// The ExecuteMutation response from Firebase Data Connect.
 class ExecuteMutationResponse extends $pb.GeneratedMessage {
   factory ExecuteMutationResponse({
     $1.Struct? data,
-    $core.Iterable<$2.GraphqlError>? errors,
+    $core.Iterable<$3.GraphqlError>? errors,
+    $4.GraphqlResponseExtensions? extensions,
   }) {
     final $result = create();
     if (data != null) {
@@ -345,6 +355,9 @@ class ExecuteMutationResponse extends $pb.GeneratedMessage {
     if (errors != null) {
       $result.errors.addAll(errors);
     }
+    if (extensions != null) {
+      $result.extensions = extensions;
+    }
     return $result;
   }
   ExecuteMutationResponse._() : super();
@@ -362,9 +375,11 @@ class ExecuteMutationResponse extends $pb.GeneratedMessage {
       createEmptyInstance: create)
     ..aOM<$1.Struct>(1, _omitFieldNames ? '' : 'data',
         subBuilder: $1.Struct.create)
-    ..pc<$2.GraphqlError>(
+    ..pc<$3.GraphqlError>(
         2, _omitFieldNames ? '' : 'errors', $pb.PbFieldType.PM,
-        subBuilder: $2.GraphqlError.create)
+        subBuilder: $3.GraphqlError.create)
+    ..aOM<$4.GraphqlResponseExtensions>(3, _omitFieldNames ? '' : 'extensions',
+        subBuilder: $4.GraphqlResponseExtensions.create)
     ..hasRequiredFields = false;
 
   @$core.Deprecated('Using this can add significant overhead to your binary. '
@@ -409,7 +424,22 @@ class ExecuteMutationResponse extends $pb.GeneratedMessage {
 
   /// Errors of this response.
   @$pb.TagNumber(2)
-  $core.List<$2.GraphqlError> get errors => $_getList(1);
+  $core.List<$3.GraphqlError> get errors => $_getList(1);
+
+  /// Additional response information.
+  @$pb.TagNumber(3)
+  $4.GraphqlResponseExtensions get extensions => $_getN(2);
+  @$pb.TagNumber(3)
+  set extensions($4.GraphqlResponseExtensions v) {
+    setField(3, v);
+  }
+
+  @$pb.TagNumber(3)
+  $core.bool hasExtensions() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearExtensions() => clearField(3);
+  @$pb.TagNumber(3)
+  $4.GraphqlResponseExtensions ensureExtensions() => $_ensure(2);
 }
 
 const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbenum.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbenum.dart
index d53ea6876082..aabd1a01d514 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbenum.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbenum.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: connector_service.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbgrpc.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbgrpc.dart
index b6704e57cca1..8b1732a117ae 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbgrpc.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbgrpc.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: connector_service.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbjson.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbjson.dart
index 834e9aad147e..03a497345922 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbjson.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/connector_service.pbjson.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: connector_service.proto
@@ -108,6 +95,14 @@ const ExecuteQueryResponse$json = {
       '6': '.google.firebase.dataconnect.v1.GraphqlError',
       '10': 'errors'
     },
+    {
+      '1': 'extensions',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.google.firebase.dataconnect.v1.GraphqlResponseExtensions',
+      '10': 'extensions'
+    },
   ],
 };
 
@@ -115,7 +110,9 @@ const ExecuteQueryResponse$json = {
 final $typed_data.Uint8List executeQueryResponseDescriptor = $convert.base64Decode(
     'ChRFeGVjdXRlUXVlcnlSZXNwb25zZRIrCgRkYXRhGAEgASgLMhcuZ29vZ2xlLnByb3RvYnVmLl'
     'N0cnVjdFIEZGF0YRJECgZlcnJvcnMYAiADKAsyLC5nb29nbGUuZmlyZWJhc2UuZGF0YWNvbm5l'
-    'Y3QudjEuR3JhcGhxbEVycm9yUgZlcnJvcnM=');
+    'Y3QudjEuR3JhcGhxbEVycm9yUgZlcnJvcnMSWQoKZXh0ZW5zaW9ucxgDIAEoCzI5Lmdvb2dsZS'
+    '5maXJlYmFzZS5kYXRhY29ubmVjdC52MS5HcmFwaHFsUmVzcG9uc2VFeHRlbnNpb25zUgpleHRl'
+    'bnNpb25z');
 
 @$core.Deprecated('Use executeMutationResponseDescriptor instead')
 const ExecuteMutationResponse$json = {
@@ -137,6 +134,14 @@ const ExecuteMutationResponse$json = {
       '6': '.google.firebase.dataconnect.v1.GraphqlError',
       '10': 'errors'
     },
+    {
+      '1': 'extensions',
+      '3': 3,
+      '4': 1,
+      '5': 11,
+      '6': '.google.firebase.dataconnect.v1.GraphqlResponseExtensions',
+      '10': 'extensions'
+    },
   ],
 };
 
@@ -144,4 +149,6 @@ const ExecuteMutationResponse$json = {
 final $typed_data.Uint8List executeMutationResponseDescriptor = $convert.base64Decode(
     'ChdFeGVjdXRlTXV0YXRpb25SZXNwb25zZRIrCgRkYXRhGAEgASgLMhcuZ29vZ2xlLnByb3RvYn'
     'VmLlN0cnVjdFIEZGF0YRJECgZlcnJvcnMYAiADKAsyLC5nb29nbGUuZmlyZWJhc2UuZGF0YWNv'
-    'bm5lY3QudjEuR3JhcGhxbEVycm9yUgZlcnJvcnM=');
+    'bm5lY3QudjEuR3JhcGhxbEVycm9yUgZlcnJvcnMSWQoKZXh0ZW5zaW9ucxgDIAEoCzI5Lmdvb2'
+    'dsZS5maXJlYmFzZS5kYXRhY29ubmVjdC52MS5HcmFwaHFsUmVzcG9uc2VFeHRlbnNpb25zUgpl'
+    'eHRlbnNpb25z');
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pb.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pb.dart
new file mode 100644
index 000000000000..4bcbcd32a4c2
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pb.dart
@@ -0,0 +1,166 @@
+//
+//  Generated code. Do not modify.
+//  source: google/protobuf/duration.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:core' as $core;
+
+import 'package:fixnum/fixnum.dart' as $fixnum;
+import 'package:protobuf/protobuf.dart' as $pb;
+import 'package:protobuf/src/protobuf/mixins/well_known.dart' as $mixin;
+
+///  A Duration represents a signed, fixed-length span of time represented
+///  as a count of seconds and fractions of seconds at nanosecond
+///  resolution. It is independent of any calendar and concepts like "day"
+///  or "month". It is related to Timestamp in that the difference between
+///  two Timestamp values is a Duration and it can be added or subtracted
+///  from a Timestamp. Range is approximately +-10,000 years.
+///
+///  # Examples
+///
+///  Example 1: Compute Duration from two Timestamps in pseudo code.
+///
+///      Timestamp start = ...;
+///      Timestamp end = ...;
+///      Duration duration = ...;
+///
+///      duration.seconds = end.seconds - start.seconds;
+///      duration.nanos = end.nanos - start.nanos;
+///
+///      if (duration.seconds < 0 && duration.nanos > 0) {
+///        duration.seconds += 1;
+///        duration.nanos -= 1000000000;
+///      } else if (duration.seconds > 0 && duration.nanos < 0) {
+///        duration.seconds -= 1;
+///        duration.nanos += 1000000000;
+///      }
+///
+///  Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
+///
+///      Timestamp start = ...;
+///      Duration duration = ...;
+///      Timestamp end = ...;
+///
+///      end.seconds = start.seconds + duration.seconds;
+///      end.nanos = start.nanos + duration.nanos;
+///
+///      if (end.nanos < 0) {
+///        end.seconds -= 1;
+///        end.nanos += 1000000000;
+///      } else if (end.nanos >= 1000000000) {
+///        end.seconds += 1;
+///        end.nanos -= 1000000000;
+///      }
+///
+///  Example 3: Compute Duration from datetime.timedelta in Python.
+///
+///      td = datetime.timedelta(days=3, minutes=10)
+///      duration = Duration()
+///      duration.FromTimedelta(td)
+///
+///  # JSON Mapping
+///
+///  In JSON format, the Duration type is encoded as a string rather than an
+///  object, where the string ends in the suffix "s" (indicating seconds) and
+///  is preceded by the number of seconds, with nanoseconds expressed as
+///  fractional seconds. For example, 3 seconds with 0 nanoseconds should be
+///  encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
+///  be expressed in JSON format as "3.000000001s", and 3 seconds and 1
+///  microsecond should be expressed in JSON format as "3.000001s".
+class Duration extends $pb.GeneratedMessage with $mixin.DurationMixin {
+  factory Duration({
+    $fixnum.Int64? seconds,
+    $core.int? nanos,
+  }) {
+    final $result = create();
+    if (seconds != null) {
+      $result.seconds = seconds;
+    }
+    if (nanos != null) {
+      $result.nanos = nanos;
+    }
+    return $result;
+  }
+  Duration._() : super();
+  factory Duration.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory Duration.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Duration',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'google.protobuf'),
+      createEmptyInstance: create,
+      toProto3Json: $mixin.DurationMixin.toProto3JsonHelper,
+      fromProto3Json: $mixin.DurationMixin.fromProto3JsonHelper)
+    ..aInt64(1, _omitFieldNames ? '' : 'seconds')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'nanos', $pb.PbFieldType.O3)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  Duration clone() => Duration()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  Duration copyWith(void Function(Duration) updates) =>
+      super.copyWith((message) => updates(message as Duration)) as Duration;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static Duration create() => Duration._();
+  Duration createEmptyInstance() => create();
+  static $pb.PbList<Duration> createRepeated() => $pb.PbList<Duration>();
+  @$core.pragma('dart2js:noInline')
+  static Duration getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Duration>(create);
+  static Duration? _defaultInstance;
+
+  /// Signed seconds of the span of time. Must be from -315,576,000,000
+  /// to +315,576,000,000 inclusive. Note: these bounds are computed from:
+  /// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
+  @$pb.TagNumber(1)
+  $fixnum.Int64 get seconds => $_getI64(0);
+  @$pb.TagNumber(1)
+  set seconds($fixnum.Int64 v) {
+    $_setInt64(0, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasSeconds() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearSeconds() => clearField(1);
+
+  /// Signed fractions of a second at nanosecond resolution of the span
+  /// of time. Durations less than one second are represented with a 0
+  /// `seconds` field and a positive or negative `nanos` field. For durations
+  /// of one second or more, a non-zero value for the `nanos` field must be
+  /// of the same sign as the `seconds` field. Must be from -999,999,999
+  /// to +999,999,999 inclusive.
+  @$pb.TagNumber(2)
+  $core.int get nanos => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set nanos($core.int v) {
+    $_setSignedInt32(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasNanos() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearNanos() => clearField(2);
+}
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pbenum.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pbenum.dart
new file mode 100644
index 000000000000..1a2c58d81056
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pbenum.dart
@@ -0,0 +1,10 @@
+//
+//  Generated code. Do not modify.
+//  source: google/protobuf/duration.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pbjson.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pbjson.dart
new file mode 100644
index 000000000000..5847acb2d458
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/duration.pbjson.dart
@@ -0,0 +1,28 @@
+//
+//  Generated code. Do not modify.
+//  source: google/protobuf/duration.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:convert' as $convert;
+import 'dart:core' as $core;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use durationDescriptor instead')
+const Duration$json = {
+  '1': 'Duration',
+  '2': [
+    {'1': 'seconds', '3': 1, '4': 1, '5': 3, '10': 'seconds'},
+    {'1': 'nanos', '3': 2, '4': 1, '5': 5, '10': 'nanos'},
+  ],
+};
+
+/// Descriptor for `Duration`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List durationDescriptor = $convert.base64Decode(
+    'CghEdXJhdGlvbhIYCgdzZWNvbmRzGAEgASgDUgdzZWNvbmRzEhQKBW5hbm9zGAIgASgFUgVuYW'
+    '5vcw==');
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pb.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pb.dart
index 7b9093d681ff..42d55e426602 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pb.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pb.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbenum.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbenum.dart
index b5acd2512df2..7f9bf0cbf322 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbenum.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbenum.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbjson.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbjson.dart
index 3f53dbf0a988..c0693f570058 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbjson.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/google/protobuf/struct.pbjson.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: google/protobuf/struct.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pb.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pb.dart
index a50398e29488..2def4cc62994 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pb.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pb.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: graphql_error.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbenum.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbenum.dart
index 9f28e16d3c23..53454c94a217 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbenum.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbenum.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: graphql_error.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbjson.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbjson.dart
index ae48a28388dc..9a90ffc79685 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbjson.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_error.pbjson.dart
@@ -1,16 +1,3 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 //
 //  Generated code. Do not modify.
 //  source: graphql_error.proto
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pb.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pb.dart
new file mode 100644
index 000000000000..c86ba89dbd75
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pb.dart
@@ -0,0 +1,222 @@
+//
+//  Generated code. Do not modify.
+//  source: graphql_response_extensions.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:core' as $core;
+
+import 'package:protobuf/protobuf.dart' as $pb;
+
+import 'google/protobuf/duration.pb.dart' as $2;
+import 'google/protobuf/struct.pb.dart' as $1;
+
+/// Data Connect specific properties for a path under response.data.
+/// (-- Design doc: http://go/fdc-caching-wire-protocol --)
+class GraphqlResponseExtensions_DataConnectProperties
+    extends $pb.GeneratedMessage {
+  factory GraphqlResponseExtensions_DataConnectProperties({
+    $1.ListValue? path,
+    $core.String? entityId,
+    $core.Iterable<$core.String>? entityIds,
+    $2.Duration? maxAge,
+  }) {
+    final $result = create();
+    if (path != null) {
+      $result.path = path;
+    }
+    if (entityId != null) {
+      $result.entityId = entityId;
+    }
+    if (entityIds != null) {
+      $result.entityIds.addAll(entityIds);
+    }
+    if (maxAge != null) {
+      $result.maxAge = maxAge;
+    }
+    return $result;
+  }
+  GraphqlResponseExtensions_DataConnectProperties._() : super();
+  factory GraphqlResponseExtensions_DataConnectProperties.fromBuffer(
+          $core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory GraphqlResponseExtensions_DataConnectProperties.fromJson(
+          $core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames
+          ? ''
+          : 'GraphqlResponseExtensions.DataConnectProperties',
+      package: const $pb.PackageName(
+          _omitMessageNames ? '' : 'google.firebase.dataconnect.v1'),
+      createEmptyInstance: create)
+    ..aOM<$1.ListValue>(1, _omitFieldNames ? '' : 'path',
+        subBuilder: $1.ListValue.create)
+    ..aOS(2, _omitFieldNames ? '' : 'entityId')
+    ..pPS(3, _omitFieldNames ? '' : 'entityIds')
+    ..aOM<$2.Duration>(4, _omitFieldNames ? '' : 'maxAge',
+        subBuilder: $2.Duration.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GraphqlResponseExtensions_DataConnectProperties clone() =>
+      GraphqlResponseExtensions_DataConnectProperties()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GraphqlResponseExtensions_DataConnectProperties copyWith(
+          void Function(GraphqlResponseExtensions_DataConnectProperties)
+              updates) =>
+      super.copyWith((message) => updates(
+              message as GraphqlResponseExtensions_DataConnectProperties))
+          as GraphqlResponseExtensions_DataConnectProperties;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GraphqlResponseExtensions_DataConnectProperties create() =>
+      GraphqlResponseExtensions_DataConnectProperties._();
+  GraphqlResponseExtensions_DataConnectProperties createEmptyInstance() =>
+      create();
+  static $pb.PbList<GraphqlResponseExtensions_DataConnectProperties>
+      createRepeated() =>
+          $pb.PbList<GraphqlResponseExtensions_DataConnectProperties>();
+  @$core.pragma('dart2js:noInline')
+  static GraphqlResponseExtensions_DataConnectProperties getDefault() =>
+      _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<
+          GraphqlResponseExtensions_DataConnectProperties>(create);
+  static GraphqlResponseExtensions_DataConnectProperties? _defaultInstance;
+
+  /// The path under response.data where the rest of the fields apply.
+  /// Each element may be a string (field name) or number (array index).
+  /// The root of response.data is denoted by the empty list `[]`.
+  /// (-- To simplify client logic, the server should never set this to null.
+  /// i.e. Use `[]` if the properties below apply to everything in data. --)
+  @$pb.TagNumber(1)
+  $1.ListValue get path => $_getN(0);
+  @$pb.TagNumber(1)
+  set path($1.ListValue v) {
+    setField(1, v);
+  }
+
+  @$pb.TagNumber(1)
+  $core.bool hasPath() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearPath() => clearField(1);
+  @$pb.TagNumber(1)
+  $1.ListValue ensurePath() => $_ensure(0);
+
+  /// A single Entity ID. Set if the path points to a single entity.
+  @$pb.TagNumber(2)
+  $core.String get entityId => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set entityId($core.String v) {
+    $_setString(1, v);
+  }
+
+  @$pb.TagNumber(2)
+  $core.bool hasEntityId() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearEntityId() => clearField(2);
+
+  /// A list of Entity IDs. Set if the path points to an array of entities. An
+  /// ID is present for each element of the array at the corresponding index.
+  @$pb.TagNumber(3)
+  $core.List<$core.String> get entityIds => $_getList(2);
+
+  /// The server-suggested duration before data under path is considered stale.
+  /// (-- Right now, this field is never set. For future plans, see
+  /// http://go/fdc-sdk-caching-config#heading=h.rmvncy2rao3g --)
+  @$pb.TagNumber(4)
+  $2.Duration get maxAge => $_getN(3);
+  @$pb.TagNumber(4)
+  set maxAge($2.Duration v) {
+    setField(4, v);
+  }
+
+  @$pb.TagNumber(4)
+  $core.bool hasMaxAge() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearMaxAge() => clearField(4);
+  @$pb.TagNumber(4)
+  $2.Duration ensureMaxAge() => $_ensure(3);
+}
+
+/// GraphqlResponseExtensions contains additional information of
+/// `GraphqlResponse` or `ExecuteQueryResponse`.
+class GraphqlResponseExtensions extends $pb.GeneratedMessage {
+  factory GraphqlResponseExtensions({
+    $core.Iterable<GraphqlResponseExtensions_DataConnectProperties>?
+        dataConnect,
+  }) {
+    final $result = create();
+    if (dataConnect != null) {
+      $result.dataConnect.addAll(dataConnect);
+    }
+    return $result;
+  }
+  GraphqlResponseExtensions._() : super();
+  factory GraphqlResponseExtensions.fromBuffer($core.List<$core.int> i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromBuffer(i, r);
+  factory GraphqlResponseExtensions.fromJson($core.String i,
+          [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
+      create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GraphqlResponseExtensions',
+      package: const $pb.PackageName(
+          _omitMessageNames ? '' : 'google.firebase.dataconnect.v1'),
+      createEmptyInstance: create)
+    ..pc<GraphqlResponseExtensions_DataConnectProperties>(
+        1, _omitFieldNames ? '' : 'dataConnect', $pb.PbFieldType.PM,
+        subBuilder: GraphqlResponseExtensions_DataConnectProperties.create)
+    ..hasRequiredFields = false;
+
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+      'Will be removed in next major version')
+  GraphqlResponseExtensions clone() =>
+      GraphqlResponseExtensions()..mergeFromMessage(this);
+  @$core.Deprecated('Using this can add significant overhead to your binary. '
+      'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+      'Will be removed in next major version')
+  GraphqlResponseExtensions copyWith(
+          void Function(GraphqlResponseExtensions) updates) =>
+      super.copyWith((message) => updates(message as GraphqlResponseExtensions))
+          as GraphqlResponseExtensions;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static GraphqlResponseExtensions create() => GraphqlResponseExtensions._();
+  GraphqlResponseExtensions createEmptyInstance() => create();
+  static $pb.PbList<GraphqlResponseExtensions> createRepeated() =>
+      $pb.PbList<GraphqlResponseExtensions>();
+  @$core.pragma('dart2js:noInline')
+  static GraphqlResponseExtensions getDefault() => _defaultInstance ??=
+      $pb.GeneratedMessage.$_defaultFor<GraphqlResponseExtensions>(create);
+  static GraphqlResponseExtensions? _defaultInstance;
+
+  /// Data Connect specific GraphQL extension, a list of paths and properties.
+  /// (-- Future fields should go inside to avoid name conflicts with other GQL
+  /// extensions in the wild unless we're implementing a common 3P pattern in
+  /// extensions such as versioning and telemetry. --)
+  @$pb.TagNumber(1)
+  $core.List<GraphqlResponseExtensions_DataConnectProperties> get dataConnect =>
+      $_getList(0);
+}
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pbenum.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pbenum.dart
new file mode 100644
index 000000000000..924da2c849bb
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pbenum.dart
@@ -0,0 +1,10 @@
+//
+//  Generated code. Do not modify.
+//  source: graphql_response_extensions.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pbjson.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pbjson.dart
new file mode 100644
index 000000000000..a1022d1267e2
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/generated/graphql_response_extensions.pbjson.dart
@@ -0,0 +1,65 @@
+//
+//  Generated code. Do not modify.
+//  source: graphql_response_extensions.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:convert' as $convert;
+import 'dart:core' as $core;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use graphqlResponseExtensionsDescriptor instead')
+const GraphqlResponseExtensions$json = {
+  '1': 'GraphqlResponseExtensions',
+  '2': [
+    {
+      '1': 'data_connect',
+      '3': 1,
+      '4': 3,
+      '5': 11,
+      '6':
+          '.google.firebase.dataconnect.v1.GraphqlResponseExtensions.DataConnectProperties',
+      '10': 'dataConnect'
+    },
+  ],
+  '3': [GraphqlResponseExtensions_DataConnectProperties$json],
+};
+
+@$core.Deprecated('Use graphqlResponseExtensionsDescriptor instead')
+const GraphqlResponseExtensions_DataConnectProperties$json = {
+  '1': 'DataConnectProperties',
+  '2': [
+    {
+      '1': 'path',
+      '3': 1,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.ListValue',
+      '10': 'path'
+    },
+    {'1': 'entity_id', '3': 2, '4': 1, '5': 9, '10': 'entityId'},
+    {'1': 'entity_ids', '3': 3, '4': 3, '5': 9, '10': 'entityIds'},
+    {
+      '1': 'max_age',
+      '3': 4,
+      '4': 1,
+      '5': 11,
+      '6': '.google.protobuf.Duration',
+      '10': 'maxAge'
+    },
+  ],
+};
+
+/// Descriptor for `GraphqlResponseExtensions`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List graphqlResponseExtensionsDescriptor = $convert.base64Decode(
+    'ChlHcmFwaHFsUmVzcG9uc2VFeHRlbnNpb25zEnIKDGRhdGFfY29ubmVjdBgBIAMoCzJPLmdvb2'
+    'dsZS5maXJlYmFzZS5kYXRhY29ubmVjdC52MS5HcmFwaHFsUmVzcG9uc2VFeHRlbnNpb25zLkRh'
+    'dGFDb25uZWN0UHJvcGVydGllc1ILZGF0YUNvbm5lY3QatwEKFURhdGFDb25uZWN0UHJvcGVydG'
+    'llcxIuCgRwYXRoGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLkxpc3RWYWx1ZVIEcGF0aBIbCgll'
+    'bnRpdHlfaWQYAiABKAlSCGVudGl0eUlkEh0KCmVudGl0eV9pZHMYAyADKAlSCWVudGl0eUlkcx'
+    'IyCgdtYXhfYWdlGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uUgZtYXhBZ2U=');
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/network/grpc_transport.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/network/grpc_transport.dart
index e0c3e660333b..180bb209168b 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/network/grpc_transport.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/network/grpc_transport.dart
@@ -173,6 +173,9 @@ ServerResponse handleResponse<Data>(CommonResponse<Data> commonResponse) {
   Map<String, dynamic>? jsond = commonResponse.data as Map<String, dynamic>?;
   String jsonEncoded = jsonEncode(commonResponse.data);
 
+  Map<String, dynamic>? jsonExt =
+      commonResponse.extensions as Map<String, dynamic>?;
+
   if (commonResponse.errors.isNotEmpty) {
     Map<String, dynamic>? data =
         jsonDecode(jsonEncoded) as Map<String, dynamic>?;
@@ -202,7 +205,7 @@ ServerResponse handleResponse<Data>(CommonResponse<Data> commonResponse) {
 
   // no errors - return a standard response
   if (jsond != null) {
-    return ServerResponse(jsond);
+    return ServerResponse(jsond, extensions: jsonExt);
   } else {
     return ServerResponse({});
   }
@@ -219,20 +222,21 @@ DataConnectTransport getTransport(
     GRPCTransport(transportOptions, options, appId, sdkType, appCheck);
 
 class CommonResponse<Data> {
-  CommonResponse(this.deserializer, this.data, this.errors);
+  CommonResponse(this.deserializer, this.data, this.errors, this.extensions);
   static CommonResponse<Data> fromExecuteMutation<Data>(
       Deserializer<Data> deserializer, ExecuteMutationResponse response) {
     return CommonResponse(
-        deserializer, response.data.toProto3Json(), response.errors);
+        deserializer, response.data.toProto3Json(), response.errors, null);
   }
 
   static CommonResponse<Data> fromExecuteQuery<Data>(
       Deserializer<Data> deserializer, ExecuteQueryResponse response) {
-    return CommonResponse(
-        deserializer, response.data.toProto3Json(), response.errors);
+    return CommonResponse(deserializer, response.data.toProto3Json(),
+        response.errors, response.extensions.toProto3Json());
   }
 
   final Deserializer<Data> deserializer;
   final Object? data;
   final List<GraphqlError> errors;
+  final Object? extensions;
 }
diff --git a/packages/firebase_data_connect/firebase_data_connect/lib/src/network/rest_transport.dart b/packages/firebase_data_connect/firebase_data_connect/lib/src/network/rest_transport.dart
index 0ee037744ffd..708d6fa02010 100644
--- a/packages/firebase_data_connect/firebase_data_connect/lib/src/network/rest_transport.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/lib/src/network/rest_transport.dart
@@ -117,6 +117,7 @@ class RestTransport implements DataConnectTransport {
       );
       Map<String, dynamic> bodyJson =
           jsonDecode(r.body) as Map<String, dynamic>;
+
       if (r.statusCode != 200) {
         String message =
             bodyJson.containsKey('message') ? bodyJson['message']! : r.body;
@@ -127,7 +128,13 @@ class RestTransport implements DataConnectTransport {
           "Received a status code of ${r.statusCode} with a message '$message'",
         );
       }
-      return ServerResponse(bodyJson);
+      final Map<String, dynamic>? extensions =
+          bodyJson['extensions'] as Map<String, dynamic>?;
+      final serverResponse = ServerResponse(bodyJson, extensions: extensions);
+      if (extensions != null && extensions.containsKey('ttl')) {
+        serverResponse.ttl = Duration(seconds: extensions['ttl'] as int);
+      }
+      return serverResponse;
     } on Exception catch (e) {
       if (e is DataConnectError) {
         rethrow;
diff --git a/packages/firebase_data_connect/firebase_data_connect/protos/connector_service.proto b/packages/firebase_data_connect/firebase_data_connect/protos/connector_service.proto
index a93b79234362..0d8e28c5221a 100644
--- a/packages/firebase_data_connect/firebase_data_connect/protos/connector_service.proto
+++ b/packages/firebase_data_connect/firebase_data_connect/protos/connector_service.proto
@@ -1,30 +1,29 @@
-/*
- * Copyright 2024 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-// Adapted from http://google3/google/firebase/dataconnect/v1main/connector_service.proto;rcl=596717236
 
+// Adapted from third_party/firebase/dataconnect/emulator/server/api/connector_service.proto
 syntax = "proto3";
 
 package google.firebase.dataconnect.v1;
 
 import "google/api/field_behavior.proto";
-import "graphql_error.proto";
 import "google/protobuf/struct.proto";
+import "graphql_error.proto";
+import "graphql_response_extensions.proto";
 
-option java_package = "google.firebase.dataconnect.proto";
+option java_package = "com.google.firebase.dataconnect.api";
 option java_multiple_files = true;
 
 // Firebase Data Connect provides means to deploy a set of predefined GraphQL
@@ -40,12 +39,11 @@ option java_multiple_files = true;
 // token.
 service ConnectorService {
   // Execute a predefined query in a Connector.
-  rpc ExecuteQuery(ExecuteQueryRequest) returns (ExecuteQueryResponse) {
-  }
+  rpc ExecuteQuery(ExecuteQueryRequest) returns (ExecuteQueryResponse) {}
 
   // Execute a predefined mutation in a Connector.
-  rpc ExecuteMutation(ExecuteMutationRequest) returns (ExecuteMutationResponse) {
-  }
+  rpc ExecuteMutation(ExecuteMutationRequest)
+      returns (ExecuteMutationResponse) {}
 }
 
 // The ExecuteQuery request to Firebase Data Connect.
@@ -94,6 +92,8 @@ message ExecuteQueryResponse {
   google.protobuf.Struct data = 1;
   // Errors of this response.
   repeated GraphqlError errors = 2;
+  // Additional response information.
+  GraphqlResponseExtensions extensions = 3;
 }
 
 // The ExecuteMutation response from Firebase Data Connect.
@@ -102,4 +102,6 @@ message ExecuteMutationResponse {
   google.protobuf.Struct data = 1;
   // Errors of this response.
   repeated GraphqlError errors = 2;
-}
\ No newline at end of file
+  // Additional response information.
+  GraphqlResponseExtensions extensions = 3;
+}
diff --git a/packages/firebase_data_connect/firebase_data_connect/protos/firebase/graphql_response_extensions.proto b/packages/firebase_data_connect/firebase_data_connect/protos/firebase/graphql_response_extensions.proto
new file mode 100644
index 000000000000..e04e1927ada4
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/protos/firebase/graphql_response_extensions.proto
@@ -0,0 +1,59 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Adapted from third_party/firebase/dataconnect/emulator/server/api/graphql_response_extensions.proto
+
+syntax = "proto3";
+
+package google.firebase.dataconnect.v1;
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
+option java_multiple_files = true;
+option java_outer_classname = "GraphqlResponseExtensionsProto";
+option java_package = "com.google.firebase.dataconnect.api";
+
+// GraphqlResponseExtensions contains additional information of
+// `GraphqlResponse` or `ExecuteQueryResponse`.
+message GraphqlResponseExtensions {
+  // Data Connect specific properties for a path under response.data.
+  // (-- Design doc: http://go/fdc-caching-wire-protocol --)
+  message DataConnectProperties {
+    // The path under response.data where the rest of the fields apply.
+    // Each element may be a string (field name) or number (array index).
+    // The root of response.data is denoted by the empty list `[]`.
+    // (-- To simplify client logic, the server should never set this to null.
+    // i.e. Use `[]` if the properties below apply to everything in data. --)
+    google.protobuf.ListValue path = 1;
+
+    // A single Entity ID. Set if the path points to a single entity.
+    string entity_id = 2;
+
+    // A list of Entity IDs. Set if the path points to an array of entities. An
+    // ID is present for each element of the array at the corresponding index.
+    repeated string entity_ids = 3;
+
+    // The server-suggested duration before data under path is considered stale.
+    // (-- Right now, this field is never set. For future plans, see
+    // http://go/fdc-sdk-caching-config#heading=h.rmvncy2rao3g --)
+    google.protobuf.Duration max_age = 4;
+  }
+  // Data Connect specific GraphQL extension, a list of paths and properties.
+  // (-- Future fields should go inside to avoid name conflicts with other GQL
+  // extensions in the wild unless we're implementing a common 3P pattern in
+  // extensions such as versioning and telemetry. --)
+  repeated DataConnectProperties data_connect = 1;
+}
+
diff --git a/packages/firebase_data_connect/firebase_data_connect/protos/google/duration.proto b/packages/firebase_data_connect/firebase_data_connect/protos/google/duration.proto
new file mode 100644
index 000000000000..cb7cf0e926cc
--- /dev/null
+++ b/packages/firebase_data_connect/firebase_data_connect/protos/google/duration.proto
@@ -0,0 +1,116 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/protobuf/types/known/durationpb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "DurationProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+
+// A Duration represents a signed, fixed-length span of time represented
+// as a count of seconds and fractions of seconds at nanosecond
+// resolution. It is independent of any calendar and concepts like "day"
+// or "month". It is related to Timestamp in that the difference between
+// two Timestamp values is a Duration and it can be added or subtracted
+// from a Timestamp. Range is approximately +-10,000 years.
+//
+// # Examples
+//
+// Example 1: Compute Duration from two Timestamps in pseudo code.
+//
+//     Timestamp start = ...;
+//     Timestamp end = ...;
+//     Duration duration = ...;
+//
+//     duration.seconds = end.seconds - start.seconds;
+//     duration.nanos = end.nanos - start.nanos;
+//
+//     if (duration.seconds < 0 && duration.nanos > 0) {
+//       duration.seconds += 1;
+//       duration.nanos -= 1000000000;
+//     } else if (duration.seconds > 0 && duration.nanos < 0) {
+//       duration.seconds -= 1;
+//       duration.nanos += 1000000000;
+//     }
+//
+// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
+//
+//     Timestamp start = ...;
+//     Duration duration = ...;
+//     Timestamp end = ...;
+//
+//     end.seconds = start.seconds + duration.seconds;
+//     end.nanos = start.nanos + duration.nanos;
+//
+//     if (end.nanos < 0) {
+//       end.seconds -= 1;
+//       end.nanos += 1000000000;
+//     } else if (end.nanos >= 1000000000) {
+//       end.seconds += 1;
+//       end.nanos -= 1000000000;
+//     }
+//
+// Example 3: Compute Duration from datetime.timedelta in Python.
+//
+//     td = datetime.timedelta(days=3, minutes=10)
+//     duration = Duration()
+//     duration.FromTimedelta(td)
+//
+// # JSON Mapping
+//
+// In JSON format, the Duration type is encoded as a string rather than an
+// object, where the string ends in the suffix "s" (indicating seconds) and
+// is preceded by the number of seconds, with nanoseconds expressed as
+// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
+// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
+// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
+// microsecond should be expressed in JSON format as "3.000001s".
+//
+//
+message Duration {
+  // Signed seconds of the span of time. Must be from -315,576,000,000
+  // to +315,576,000,000 inclusive. Note: these bounds are computed from:
+  // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
+  int64 seconds = 1;
+
+  // Signed fractions of a second at nanosecond resolution of the span
+  // of time. Durations less than one second are represented with a 0
+  // `seconds` field and a positive or negative `nanos` field. For durations
+  // of one second or more, a non-zero value for the `nanos` field must be
+  // of the same sign as the `seconds` field. Must be from -999,999,999
+  // to +999,999,999 inclusive.
+  int32 nanos = 2;
+}
\ No newline at end of file
diff --git a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml
index e71288430a1e..971425f165dc 100644
--- a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml
+++ b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml
@@ -16,6 +16,7 @@ dependencies:
   firebase_auth: ^6.1.3
   firebase_core: ^4.3.0
   firebase_core_platform_interface: ^6.0.2
+  fixnum: ^1.1.1
   flutter:
     sdk: flutter
   grpc: ^3.2.4
diff --git a/packages/firebase_data_connect/firebase_data_connect/test/src/cache/cache_manager_test.dart b/packages/firebase_data_connect/firebase_data_connect/test/src/cache/cache_manager_test.dart
index db40791ad2a0..dec53744b7e3 100644
--- a/packages/firebase_data_connect/firebase_data_connect/test/src/cache/cache_manager_test.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/test/src/cache/cache_manager_test.dart
@@ -18,7 +18,7 @@ import 'package:firebase_data_connect/src/core/ref.dart';
 import 'package:firebase_data_connect/src/network/rest_library.dart';
 import 'package:firebase_data_connect/src/common/common_library.dart';
 import 'package:firebase_data_connect/src/cache/cache_data_types.dart';
-import 'package:firebase_data_connect/src/cache/cache_manager.dart';
+import 'package:firebase_data_connect/src/cache/cache.dart';
 import 'package:firebase_data_connect/src/cache/cache_provider.dart';
 import 'package:firebase_data_connect/src/cache/in_memory_cache_provider.dart';
 import 'package:firebase_data_connect/src/cache/sqlite_cache_provider.dart';
@@ -51,18 +51,27 @@ void main() {
   const String simpleQueryResponse = '''
     {"data": {"items":[
     
-    {"desc":"itemDesc1","name":"itemOne", "cacheId":"123","price":4},
-    {"desc":"itemDesc2","name":"itemTwo", "cacheId":"345","price":7}
+    {"desc":"itemDesc1","name":"itemOne","price":4},
+    {"desc":"itemDesc2","name":"itemTwo","price":7}
     
     ]}}
   ''';
 
+  final Map<String, dynamic> simpleQueryExtensions = {
+    'dataConnect': [
+      {
+        'path': ['items'],
+        'entityIds': ['123', '345']
+      }
+    ]
+  };
+
   // query that updates the price for cacheId 123 to 11
   const String simpleQueryResponseUpdate = '''
     {"data": {"items":[
     
-    {"desc":"itemDesc1","name":"itemOne", "cacheId":"123","price":11},
-    {"desc":"itemDesc2","name":"itemTwo", "cacheId":"345","price":7}
+    {"desc":"itemDesc1","name":"itemOne","price":11},
+    {"desc":"itemDesc2","name":"itemTwo","price":7}
     
     ]}}
   ''';
@@ -70,10 +79,19 @@ void main() {
   // query two has same object as query one so should refer to same Entity.
   const String simpleQueryTwoResponse = '''
     {"data": {
-    "item": { "desc":"itemDesc1","name":"itemOne", "cacheId":"123","price":4 }
+    "item": { "desc":"itemDesc1","name":"itemOne","price":4 }
     }}
   ''';
 
+  final Map<String, dynamic> simpleQueryTwoExtensions = {
+    'dataConnect': [
+      {
+        'path': ['item'],
+        'entityId': '123'
+      }
+    ]
+  };
+
   group('Cache Provider Tests', () {
     setUp(() async {
       mockApp = MockFirebaseApp();
@@ -126,9 +144,11 @@ void main() {
 
       Map<String, dynamic> jsonData =
           jsonDecode(simpleQueryResponse) as Map<String, dynamic>;
-      await cache.update('itemsSimple', ServerResponse(jsonData));
+      await cache.update('itemsSimple',
+          ServerResponse(jsonData, extensions: simpleQueryExtensions));
 
-      Map<String, dynamic>? cachedData = await cache.get('itemsSimple', true);
+      Map<String, dynamic>? cachedData =
+          await cache.resultTree('itemsSimple', true);
 
       expect(jsonData['data'], cachedData);
     }); // test set get
@@ -144,8 +164,8 @@ void main() {
       edo.updateServerValue('name', 'test', null);
       edo.updateServerValue('desc', 'testDesc', null);
 
-      cp.saveEntityDataObject(edo);
-      EntityDataObject edo2 = cp.getEntityDataObject('1234');
+      cp.updateEntityData(edo);
+      EntityDataObject edo2 = cp.getEntityData('1234');
 
       expect(edo.fields().length, edo2.fields().length);
       expect(edo.fields()['name'], edo2.fields()['name']);
@@ -162,21 +182,24 @@ void main() {
 
       Map<String, dynamic> jsonDataOne =
           jsonDecode(simpleQueryResponse) as Map<String, dynamic>;
-      await cache.update(queryOneId, ServerResponse(jsonDataOne));
+      await cache.update(queryOneId,
+          ServerResponse(jsonDataOne, extensions: simpleQueryExtensions));
 
       Map<String, dynamic> jsonDataTwo =
           jsonDecode(simpleQueryTwoResponse) as Map<String, dynamic>;
-      await cache.update(queryTwoId, ServerResponse(jsonDataTwo));
+      await cache.update(queryTwoId,
+          ServerResponse(jsonDataTwo, extensions: simpleQueryTwoExtensions));
 
       Map<String, dynamic> jsonDataOneUpdate =
           jsonDecode(simpleQueryResponseUpdate) as Map<String, dynamic>;
-      await cache.update(queryOneId, ServerResponse(jsonDataOneUpdate));
+      await cache.update(queryOneId,
+          ServerResponse(jsonDataOneUpdate, extensions: simpleQueryExtensions));
       // shared object should be updated.
       // now reload query two from cache and check object value.
       // it should be updated
 
       Map<String, dynamic>? jsonDataTwoUpdated =
-          await cache.get(queryTwoId, true);
+          await cache.resultTree(queryTwoId, true);
       if (jsonDataTwoUpdated == null) {
         fail('No query two found in cache');
       }
@@ -194,16 +217,16 @@ void main() {
       await cp.initialize();
 
       String oid = '1234';
-      EntityDataObject edo = cp.getEntityDataObject(oid);
+      EntityDataObject edo = cp.getEntityData(oid);
 
       String testValue = 'testValue';
       String testProp = 'testProp';
 
       edo.updateServerValue(testProp, testValue, null);
 
-      cp.saveEntityDataObject(edo);
+      cp.updateEntityData(edo);
 
-      EntityDataObject edo2 = cp.getEntityDataObject(oid);
+      EntityDataObject edo2 = cp.getEntityData(oid);
       String value = edo2.fields()[testProp];
 
       expect(testValue, value);
@@ -221,7 +244,8 @@ void main() {
 
       Map<String, dynamic> jsonData =
           jsonDecode(simpleQueryResponse) as Map<String, dynamic>;
-      await cache.update('itemsSimple', ServerResponse(jsonData));
+      await cache.update('itemsSimple',
+          ServerResponse(jsonData, extensions: simpleQueryExtensions));
 
       QueryRef ref = QueryRef(
         dataConnect,
@@ -254,5 +278,47 @@ void main() {
         expect(resultDelayed.source, DataSource.server);
       });
     });
+
+    test('Test AnyValue Caching', () async {
+      if (dataConnect.cacheManager == null) {
+        fail('No cache available');
+      }
+
+      Cache cache = dataConnect.cacheManager!;
+
+      const String anyValueSingleData = '''
+      {"data": {"anyValueItem":
+        { "name": "AnyItem B",
+          "blob": {"values":["A", 45, {"embedKey": "embedVal"}, ["A", "AA"]]}
+        }
+      }}
+      ''';
+
+      final Map<String, dynamic> anyValueSingleExt = {
+        'dataConnect': [
+          {
+            'path': ['anyValueItem'],
+            'entityId': 'AnyValueItemSingle_ID'
+          }
+        ]
+      };
+
+      Map<String, dynamic> jsonData =
+          jsonDecode(anyValueSingleData) as Map<String, dynamic>;
+
+      await cache.update('queryAnyValue',
+          ServerResponse(jsonData, extensions: anyValueSingleExt));
+
+      Map<String, dynamic>? cachedData =
+          await cache.resultTree('queryAnyValue', true);
+
+      expect(cachedData?['anyValueItem']?['name'], 'AnyItem B');
+      List<dynamic> values = cachedData?['anyValueItem']?['blob']?['values'];
+      expect(values.length, 4);
+      expect(values[0], 'A');
+      expect(values[1], 45);
+      expect(values[2], {'embedKey': 'embedVal'});
+      expect(values[3], ['A', 'AA']);
+    });
   }); // test group
 } //main
diff --git a/packages/firebase_data_connect/firebase_data_connect/test/src/cache/result_tree_processor_test.dart b/packages/firebase_data_connect/firebase_data_connect/test/src/cache/result_tree_processor_test.dart
index 6d3c71d09a17..9b347425c7dc 100644
--- a/packages/firebase_data_connect/firebase_data_connect/test/src/cache/result_tree_processor_test.dart
+++ b/packages/firebase_data_connect/firebase_data_connect/test/src/cache/result_tree_processor_test.dart
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import 'package:firebase_data_connect/src/cache/cache_data_types.dart';
 import 'package:firebase_data_connect/src/cache/result_tree_processor.dart';
+import 'package:firebase_data_connect/src/common/common_library.dart';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'dart:convert';
@@ -23,19 +25,46 @@ void main() {
   const String simpleQueryResponse = '''
     {"data": {"items":[
     
-    {"desc":"itemDesc1","name":"itemOne", "cacheId":"123","price":4},
-    {"desc":"itemDesc2","name":"itemTwo", "cacheId":"345","price":7}
+    {"desc":"itemDesc1","name":"itemOne","price":4},
+    {"desc":"itemDesc2","name":"itemTwo","price":7}
     
     ]}}
   ''';
 
+  final Map<DataConnectPath, PathMetadata> simpleQueryPaths = {
+    DataConnectPath([
+      DataConnectFieldPathSegment('items'),
+      DataConnectListIndexPathSegment(0)
+    ]): PathMetadata(
+        path: DataConnectPath([
+          DataConnectFieldPathSegment('items'),
+          DataConnectListIndexPathSegment(0)
+        ]),
+        entityId: '123'),
+    DataConnectPath([
+      DataConnectFieldPathSegment('items'),
+      DataConnectListIndexPathSegment(1)
+    ]): PathMetadata(
+        path: DataConnectPath([
+          DataConnectFieldPathSegment('items'),
+          DataConnectListIndexPathSegment(1)
+        ]),
+        entityId: '345'),
+  };
+
   // query two has same object as query one so should refer to same Entity.
   const String simpleQueryResponseTwo = '''
     {"data": {
-    "item": { "desc":"itemDesc1","name":"itemOne", "cacheId":"123","price":4 }
+    "item": { "desc":"itemDesc1","name":"itemOne","price":4 }
     }}
   ''';
 
+  final Map<DataConnectPath, PathMetadata> simpleQueryTwoPaths = {
+    DataConnectPath([DataConnectFieldPathSegment('item')]): PathMetadata(
+        path: DataConnectPath([DataConnectFieldPathSegment('item')]),
+        entityId: '123'),
+  };
+
   group('CacheProviderTests', () {
     // Dehydrate two queries sharing a single object.
     // Confirm that same EntityDataObject is present in both the dehydrated queries
@@ -45,8 +74,8 @@ void main() {
 
       Map<String, dynamic> jsonData =
           jsonDecode(simpleQueryResponse) as Map<String, dynamic>;
-      DehydrationResult result =
-          await rp.dehydrate('itemsSimple', jsonData['data'], cp);
+      DehydrationResult result = await rp.dehydrateResults(
+          'itemsSimple', jsonData['data'], cp, simpleQueryPaths);
       expect(result.dehydratedTree.nestedObjectLists?.length, 1);
       expect(result.dehydratedTree.nestedObjectLists?['items']?.length, 2);
       expect(result.dehydratedTree.nestedObjectLists?['items']?.first.entity,
@@ -54,8 +83,8 @@ void main() {
 
       Map<String, dynamic> jsonDataTwo =
           jsonDecode(simpleQueryResponseTwo) as Map<String, dynamic>;
-      DehydrationResult resultTwo =
-          await rp.dehydrate('itemsSimpleTwo', jsonDataTwo, cp);
+      DehydrationResult resultTwo = await rp.dehydrateResults(
+          'itemsSimpleTwo', jsonDataTwo['data'], cp, simpleQueryTwoPaths);
 
       List<String>? guids = result.dehydratedTree.nestedObjectLists?['items']
           ?.map((item) => item.entity?.guid)