diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/ListComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/ListComparer.cs
index f55d5ea3891..cbb65b37454 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/ListComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/ListComparer.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal
@@ -50,7 +48,7 @@ private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TEleme
                 return false;
             }
 
-            if (aList == bList)
+            if (ReferenceEquals(aList, bList))
             {
                 return true;
             }
@@ -79,7 +77,7 @@ private static int GetHashCode(TCollection source, ValueComparer<TElement> eleme
 
         private static TCollection? Snapshot(TCollection? source, ValueComparer<TElement> elementComparer, bool readOnly)
         {
-            if (source == null)
+            if (source is null)
             {
                 return null;
             }
diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/NullableListComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/NullableListComparer.cs
index b1582cc32b1..94b9d90e942 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/NullableListComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/NullableListComparer.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal
@@ -28,7 +26,8 @@ public NullableListComparer(ValueComparer elementComparer, bool readOnly)
                 (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
                 o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
                 source => Snapshot(source, (ValueComparer<TElement>)elementComparer, readOnly))
-        { }
+        {
+        }
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -50,7 +49,7 @@ private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TEleme
                 return false;
             }
 
-            if (aList == bList)
+            if (ReferenceEquals(aList, bList))
             {
                 return true;
             }
@@ -90,7 +89,7 @@ private static int GetHashCode(TCollection source, ValueComparer<TElement> eleme
 
         private static TCollection? Snapshot(TCollection? source, ValueComparer<TElement> elementComparer, bool readOnly)
         {
-            if (source == null)
+            if (source is null)
             {
                 return null;
             }
diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/NullableSingleDimensionalArrayComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/NullableSingleDimensionalArrayComparer.cs
index 04f6d950605..a845232b77c 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/NullableSingleDimensionalArrayComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/NullableSingleDimensionalArrayComparer.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
@@ -26,7 +25,8 @@ public NullableSingleDimensionalArrayComparer(ValueComparer elementComparer) : b
             (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
             o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
             source => Snapshot(source, (ValueComparer<TElement>)elementComparer))
-        { }
+        {
+        }
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -48,6 +48,11 @@ private static bool Compare(TElement?[]? a, TElement?[]? b, ValueComparer<TEleme
                 return false;
             }
 
+            if (ReferenceEquals(a, b))
+            {
+                return true;
+            }
+
             for (var i = 0; i < a.Length; i++)
             {
                 var (aElement, bElement) = (a[i], b[i]);
@@ -84,7 +89,7 @@ private static int GetHashCode(TElement?[] source, ValueComparer<TElement> eleme
         [return: NotNullIfNotNull("source")]
         private static TElement?[]? Snapshot(TElement?[]? source, ValueComparer<TElement> elementComparer)
         {
-            if (source == null)
+            if (source is null)
             {
                 return null;
             }
diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/NullableStringDictionaryComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/NullableStringDictionaryComparer.cs
index 5f3c4ae58be..02c7f5a86fb 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/NullableStringDictionaryComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/NullableStringDictionaryComparer.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal
@@ -51,7 +49,7 @@ private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TEleme
                 return false;
             }
 
-            if (aDict == bDict)
+            if (ReferenceEquals(aDict, bDict))
             {
                 return true;
             }
@@ -97,7 +95,7 @@ private static int GetHashCode(TCollection source, ValueComparer<TElement> eleme
 
         private static TCollection? Snapshot(TCollection? source, ValueComparer<TElement> elementComparer, bool readOnly)
         {
-            if (source == null)
+            if (source is null)
             {
                 return null;
             }
diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/SingleDimensionalArrayComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/SingleDimensionalArrayComparer.cs
index bf195dc1169..e84a997e1a5 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/SingleDimensionalArrayComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/SingleDimensionalArrayComparer.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
@@ -25,7 +24,8 @@ public SingleDimensionalArrayComparer(ValueComparer elementComparer) : base(
             (a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer),
             o => GetHashCode(o, (ValueComparer<TElement>)elementComparer),
             source => Snapshot(source, (ValueComparer<TElement>)elementComparer))
-        { }
+        {
+        }
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -47,6 +47,11 @@ private static bool Compare(TElement[]? a, TElement[]? b, ValueComparer<TElement
                 return false;
             }
 
+            if (ReferenceEquals(a, b))
+            {
+                return true;
+            }
+
             for (var i = 0; i < a.Length; i++)
             {
                 if (!elementComparer.Equals(a[i], b[i]))
@@ -72,7 +77,7 @@ private static int GetHashCode(TElement[] source, ValueComparer<TElement> elemen
         [return: NotNullIfNotNull("source")]
         private static TElement[]? Snapshot(TElement[]? source, ValueComparer<TElement> elementComparer)
         {
-            if (source == null)
+            if (source is null)
             {
                 return null;
             }
diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs
index caa08e52258..61cf84d8b12 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal
@@ -50,19 +48,15 @@ private static bool Compare(TCollection? a, TCollection? b, ValueComparer<TEleme
                 return false;
             }
 
-            if (aDict == bDict)
+            if (ReferenceEquals(aDict, bDict))
             {
                 return true;
             }
 
             foreach (var aPair in aDict)
             {
-                if (!bDict.TryGetValue(aPair.Key, out var bValue))
-                {
-                    return false;
-                }
-
-                if (!elementComparer.Equals(aPair.Value, bValue))
+                if (!bDict.TryGetValue(aPair.Key, out var bValue)
+                    || !elementComparer.Equals(aPair.Value, bValue))
                 {
                     return false;
                 }
@@ -85,7 +79,7 @@ private static int GetHashCode(TCollection source, ValueComparer<TElement> eleme
 
         private static TCollection? Snapshot(TCollection? source, ValueComparer<TElement> elementComparer, bool readOnly)
         {
-            if (source == null)
+            if (source is null)
             {
                 return null;
             }
diff --git a/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs b/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs
index fce71a4dfc9..b95eeb556a5 100644
--- a/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs
+++ b/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -79,7 +77,9 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
 
             if (clrType.IsArray)
             {
-                var elementMapping = FindPrimitiveMapping(new TypeMappingInfo(elementType));
+                var elementMappingInfo = new TypeMappingInfo(elementType);
+                var elementMapping = FindPrimitiveMapping(elementMappingInfo)
+                    ?? FindCollectionMapping(elementMappingInfo);
                 return elementMapping == null
                     ? null
                     : new CosmosTypeMapping(clrType, CreateArrayComparer(elementMapping, elementType));
@@ -93,11 +93,12 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                     || genericTypeDefinition == typeof(IList<>)
                     || genericTypeDefinition == typeof(IReadOnlyList<>))
                 {
-                    var elementMapping = FindPrimitiveMapping(new TypeMappingInfo(elementType));
+                    var elementMappingInfo = new TypeMappingInfo(elementType);
+                    var elementMapping = FindPrimitiveMapping(elementMappingInfo)
+                        ?? FindCollectionMapping(elementMappingInfo);
                     return elementMapping == null
                         ? null
-                        : new CosmosTypeMapping(clrType,
-                            CreateListComparer(elementMapping, elementType, clrType, genericTypeDefinition == typeof(IReadOnlyList<>)));
+                        : new CosmosTypeMapping(clrType, CreateListComparer(elementMapping, elementType, clrType));
                 }
 
                 if (genericTypeDefinition == typeof(Dictionary<,>)
@@ -111,16 +112,12 @@ public CosmosTypeMappingSource(TypeMappingSourceDependencies dependencies)
                     }
 
                     elementType = genericArguments[1];
-                    var elementMapping = FindPrimitiveMapping(new TypeMappingInfo(elementType));
-                    if(elementMapping == null)
-                    {
-                        return null;
-                    }
-
+                    var elementMappingInfo = new TypeMappingInfo(elementType);
+                    var elementMapping = FindPrimitiveMapping(elementMappingInfo)
+                        ?? FindCollectionMapping(elementMappingInfo);
                     return elementMapping == null
                         ? null
-                        : new CosmosTypeMapping(clrType,
-                            CreateStringDictionaryComparer(elementMapping, elementType, clrType, genericTypeDefinition == typeof(IReadOnlyDictionary<,>)));
+                        : new CosmosTypeMapping(clrType, CreateStringDictionaryComparer(elementMapping, elementType, clrType));
                 }
             }
 
@@ -139,7 +136,7 @@ private static ValueComparer CreateArrayComparer(CoreTypeMapping elementMapping,
         }
 
         private static ValueComparer CreateListComparer(
-            CoreTypeMapping elementMapping, Type elementType, Type listType, bool readOnly)
+            CoreTypeMapping elementMapping, Type elementType, Type listType, bool readOnly = false)
         {
             var unwrappedType = elementType.UnwrapNullableType();
 
@@ -152,7 +149,7 @@ private static ValueComparer CreateListComparer(
         }
 
         private static ValueComparer CreateStringDictionaryComparer(
-            CoreTypeMapping elementMapping, Type elementType, Type dictType, bool readOnly)
+            CoreTypeMapping elementMapping, Type elementType, Type dictType, bool readOnly = false)
         {
             var unwrappedType = elementType.UnwrapNullableType();
 
diff --git a/test/EFCore.Cosmos.FunctionalTests/EndToEndCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/EndToEndCosmosTest.cs
index 7a4f38700de..9fe5c7bc24b 100644
--- a/test/EFCore.Cosmos.FunctionalTests/EndToEndCosmosTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/EndToEndCosmosTest.cs
@@ -1,12 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 using Microsoft.Azure.Cosmos;
+using Microsoft.Azure.Cosmos.Serialization.HybridRow;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
@@ -518,7 +516,6 @@ await Can_add_update_delete_with_collection(
                 },
                 new[] { 3f, 2 });
 
-
             await Can_add_update_delete_with_collection(
                 new decimal?[] { 1, null },
                 c =>
@@ -554,6 +551,79 @@ await Can_add_update_delete_with_collection(
                 new Dictionary<string, short?> { { "1", 1 }, { "2", null } });
         }
 
+        [ConditionalFact]
+        public async Task Can_add_update_delete_with_nested_collections()
+        {
+            await Can_add_update_delete_with_collection(
+                new List<List<short>> { new List<short> { 1, 2 } },
+                c =>
+                {
+                    c.Collection.Clear();
+                    c.Collection.Add(new List<short> { 3 });
+                },
+                new List<List<short>> { new List<short> { 3 } });
+
+            await Can_add_update_delete_with_collection<IList<byte?[]>>(
+                new List<byte?[]>(),
+                c =>
+                {
+                    c.Collection.Add(new byte?[] { 3, null });
+                    c.Collection.Add(null);
+                },
+                new List<byte?[]> { new byte?[] { 3, null }, null });
+
+            await Can_add_update_delete_with_collection<IReadOnlyList<Dictionary<string, string>>>(
+                new Dictionary<string, string>[] { new Dictionary<string, string> { { "1", null } } },
+                c =>
+                {
+                    var dictionary = c.Collection[0]["3"] = "2";
+                },
+                new List<Dictionary<string, string>> { new Dictionary<string, string> { { "1", null }, { "3", "2" } } });
+
+            await Can_add_update_delete_with_collection(
+                new List<float>[] { new List<float> { 1f }, new List<float> { 2 } },
+                c =>
+                {
+                    c.Collection[1][0] = 3f;
+                },
+                new List<float>[] { new List<float> { 1f }, new List<float> { 3f } });
+
+            await Can_add_update_delete_with_collection(
+                new decimal?[][] { new decimal?[] { 1, null } },
+                c =>
+                {
+                    c.Collection[0][1] = 3;
+                },
+                new decimal?[][] { new decimal?[] { 1, 3 } });
+
+            await Can_add_update_delete_with_collection(
+                new Dictionary<string, List<int>> { { "1", new List<int> { 1 } } },
+                c =>
+                {
+                    c.Collection["2"] = new List<int> { 3 };
+                },
+                new Dictionary<string, List<int>> { { "1", new List<int> { 1 } }, { "2", new List<int> { 3 } } });
+
+            await Can_add_update_delete_with_collection<IDictionary<string, long?[]>>(
+                new SortedDictionary<string, long?[]> { { "2", new long?[] { 2 } }, { "1", new long?[] { 1 } } },
+                c =>
+                {
+                    c.Collection.Clear();
+                    c.Collection["2"] = null;
+                },
+                new SortedDictionary<string, long?[]> { { "2", null } });
+
+            await Can_add_update_delete_with_collection<IReadOnlyDictionary<string, Dictionary<string, short?>>>(
+                 ImmutableDictionary<string, Dictionary<string, short?>>.Empty
+                    .Add("2", new Dictionary<string, short?> { { "value", 2 } }).Add("1", new Dictionary<string, short?> { { "value", 1 } }),
+                c =>
+                {
+                    c.Collection = ImmutableDictionary<string, Dictionary<string, short?>>.Empty
+                        .Add("1", new Dictionary<string, short?> { { "value", 1 } }).Add("2", null);
+                },
+                new Dictionary<string, Dictionary<string, short?>> { { "1", new Dictionary<string, short?> { { "value", 1 } } }, { "2", null } });
+        }
+
         private async Task Can_add_update_delete_with_collection<TCollection>(
             TCollection initialValue,
             Action<CustomerWithCollection<TCollection>> modify,
diff --git a/test/EFCore.Cosmos.FunctionalTests/ValueConvertersEndToEndCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/ValueConvertersEndToEndCosmosTest.cs
index c83641d9593..d8484b62b4b 100644
--- a/test/EFCore.Cosmos.FunctionalTests/ValueConvertersEndToEndCosmosTest.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/ValueConvertersEndToEndCosmosTest.cs
@@ -5,7 +5,7 @@
 
 #nullable enable
 
-namespace Microsoft.EntityFrameworkCore
+namespace Microsoft.EntityFrameworkCore.Cosmos
 {
     public class ValueConvertersEndToEndCosmosTest
         : ValueConvertersEndToEndTestBase<ValueConvertersEndToEndCosmosTest.ValueConvertersEndToEndCosmosFixture>