diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
index ab584aad2..fb6107190 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
@@ -58,16 +58,18 @@ namespace UniGLTF
             }
         }
 
-        /// <summary>
-        /// URI access
-        /// </summary>
-        public IStorage _storage;
-
         /// <summary>
         /// Migration Flags used by ImporterContext
         /// </summary>
         public MigrationFlags MigrationFlags { get; }
 
+        /// <summary>
+        /// URI access
+        /// </summary>
+        IStorage _storage;
+
+        Dictionary<string, ArraySegment<byte>> _dataUriCache = new Dictionary<string, ArraySegment<byte>>();
+
         public GltfData(string targetPath, string json, glTF gltf, IReadOnlyList<GlbChunk> chunks, IStorage storage, MigrationFlags migrationFlags)
         {
             TargetPath = targetPath;
@@ -89,7 +91,7 @@ namespace UniGLTF
                 string.Empty,
                 string.Empty,
                 gltf,
-                new List<GlbChunk>  
+                new List<GlbChunk>
                 {
                     new GlbChunk(), // json
                     GlbChunk.CreateBin(bytes),
@@ -99,8 +101,6 @@ namespace UniGLTF
             );
         }
 
-        Dictionary<string, ArraySegment<byte>> _dataCache = new Dictionary<string, ArraySegment<byte>>();
-
         public ArraySegment<Byte> GetBytesFromUri(string uri)
         {
             if (string.IsNullOrEmpty(uri))
@@ -109,12 +109,12 @@ namespace UniGLTF
             }
             if (uri.StartsWith("data:", StringComparison.Ordinal))
             {
-                if (_dataCache.TryGetValue(uri, out ArraySegment<byte> data))
+                if (_dataUriCache.TryGetValue(uri, out ArraySegment<byte> data))
                 {
                     return data;
                 }
                 data = new ArraySegment<byte>(UriByteBuffer.ReadEmbedded(uri));
-                _dataCache.Add(uri, data);
+                _dataUriCache.Add(uri, data);
                 return data;
             }
             else
diff --git a/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs b/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs
index fea2221af..0a90b7d38 100644
--- a/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs
+++ b/Assets/UniGLTF/Tests/UniGLTF/UniGLTFTests.cs
@@ -115,7 +115,7 @@ namespace UniGLTF
             }
 
             // parse
-            var parsed = GltfData.CreateFromExport(data);
+            var parsed = GltfData.CreateFromExportForTest(data);
 
             // import
             using (var context = new ImporterContext(parsed))
@@ -554,7 +554,7 @@ namespace UniGLTF
 
                 // import
                 {
-                    var parsed = GltfData.CreateFromExport(data);
+                    var parsed = GltfData.CreateFromExportForTest(data);
                     using (var context = new ImporterContext(parsed))
                     using (var loaded = context.Load())
                     {
@@ -572,7 +572,7 @@ namespace UniGLTF
 
                 // import new version
                 {
-                    var parsed = GltfData.CreateFromExport(data);
+                    var parsed = GltfData.CreateFromExportForTest(data);
                     using (var context = new ImporterContext(parsed))
                     using (var loaded = context.Load())
                     {
@@ -624,7 +624,7 @@ namespace UniGLTF
 
                 // import
                 {
-                    var parsed = GltfData.CreateFromExport(data);
+                    var parsed = GltfData.CreateFromExportForTest(data);
                     using (var context = new ImporterContext(parsed))
                     using (var loaded = context.Load())
                     {
@@ -688,7 +688,7 @@ namespace UniGLTF
 
                 // import
                 {
-                    var parsed = GltfData.CreateFromExport(data);
+                    var parsed = GltfData.CreateFromExportForTest(data);
                     using (var context = new ImporterContext(parsed))
                     using (var loaded = context.Load())
                     {