diff --git a/packages/file/lib/src/backends/record_replay/codecs.dart b/packages/file/lib/src/backends/record_replay/codecs.dart
index d90cd4d..651be60 100644
--- a/packages/file/lib/src/backends/record_replay/codecs.dart
+++ b/packages/file/lib/src/backends/record_replay/codecs.dart
@@ -221,7 +221,7 @@
     };
   }
 
-  static path.Context _decode(Map<String, String> input) {
+  static path.Context _decode(Map<String, dynamic> input) {
     return new path.Context(
       style: <String, path.Style>{
         'posix': path.Style.posix,
@@ -237,8 +237,8 @@
       const _ForwardingConverter<path.Context, Map<String, String>>(_encode);
 
   /// Converter that deserializes [path.Context] instances.
-  static const Converter<Map<String, String>, path.Context> deserialize =
-      const _ForwardingConverter<Map<String, String>, path.Context>(_decode);
+  static const Converter<Map<String, dynamic>, path.Context> deserialize =
+      const _ForwardingConverter<Map<String, dynamic>, path.Context>(_decode);
 
   @override
   Converter<path.Context, Map<String, String>> get encoder => serialize;
