diff --git a/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs b/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs
index aa4589d54b8..408c250627d 100644
--- a/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs
+++ b/src/EFCore.Cosmos/ChangeTracking/Internal/StringDictionaryComparer.cs
@@ -15,13 +15,13 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal;
 public sealed class StringDictionaryComparer<TDictionary, TElement> : ValueComparer<object>, IInfrastructure<ValueComparer>
 {
     private static readonly MethodInfo CompareMethod = typeof(StringDictionaryComparer<TDictionary, TElement>).GetMethod(
-        nameof(Compare), BindingFlags.Static | BindingFlags.NonPublic, [typeof(object), typeof(object), typeof(ValueComparer)])!;
+        nameof(Compare), BindingFlags.Static | BindingFlags.Public, [typeof(object), typeof(object), typeof(Func<TElement, TElement, bool>)])!;
 
     private static readonly MethodInfo GetHashCodeMethod = typeof(StringDictionaryComparer<TDictionary, TElement>).GetMethod(
-        nameof(GetHashCode), BindingFlags.Static | BindingFlags.NonPublic, [typeof(IEnumerable), typeof(ValueComparer)])!;
+        nameof(GetHashCode), BindingFlags.Static | BindingFlags.Public, [typeof(IEnumerable), typeof(Func<TElement, int>)])!;
 
     private static readonly MethodInfo SnapshotMethod = typeof(StringDictionaryComparer<TDictionary, TElement>).GetMethod(
-        nameof(Snapshot), BindingFlags.Static | BindingFlags.NonPublic, [typeof(object), typeof(ValueComparer)])!;
+        nameof(Snapshot), BindingFlags.Static | BindingFlags.Public, [typeof(object), typeof(Func<TElement, TElement>)])!;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -57,9 +57,7 @@ ValueComparer IInfrastructure<ValueComparer>.Instance
                 CompareMethod,
                 prm1,
                 prm2,
-#pragma warning disable EF9100
-                elementComparer.ConstructorExpression),
-#pragma warning restore EF9100
+                elementComparer.EqualsExpression),
             prm1,
             prm2);
     }
@@ -74,9 +72,7 @@ private static Expression<Func<object, int>> GetHashCodeLambda(ValueComparer ele
                 Expression.Convert(
                     prm,
                     typeof(IEnumerable)),
-#pragma warning disable EF9100
-                elementComparer.ConstructorExpression),
-#pragma warning restore EF9100
+                    elementComparer.HashCodeExpression),
             prm);
     }
 
@@ -88,13 +84,11 @@ private static Expression<Func<object, object>> SnapshotLambda(ValueComparer ele
             Expression.Call(
                 SnapshotMethod,
                 prm,
-#pragma warning disable EF9100
-                elementComparer.ConstructorExpression),
-#pragma warning restore EF9100
+                elementComparer.SnapshotExpression),
             prm);
     }
 
-    private static bool Compare(object? a, object? b, ValueComparer elementComparer)
+    public static bool Compare(object? a, object? b, Func<TElement?, TElement?, bool> elementCompare)
     {
         if (ReferenceEquals(a, b))
         {
@@ -121,7 +115,7 @@ private static bool Compare(object? a, object? b, ValueComparer elementComparer)
             foreach (var pair in aDictionary)
             {
                 if (!bDictionary.TryGetValue(pair.Key, out var bValue)
-                    || !elementComparer.Equals(pair.Value, bValue))
+                    || !elementCompare(pair.Value, bValue))
                 {
                     return false;
                 }
@@ -133,17 +127,17 @@ private static bool Compare(object? a, object? b, ValueComparer elementComparer)
         throw new InvalidOperationException(
             CosmosStrings.BadDictionaryType(
                 (a is IDictionary<string, TElement?> ? b : a).GetType().ShortDisplayName(),
-                typeof(IDictionary<,>).MakeGenericType(typeof(string), elementComparer.Type).ShortDisplayName()));
+                typeof(IDictionary<,>).MakeGenericType(typeof(string), typeof(TElement)).ShortDisplayName()));
     }
 
-    private static int GetHashCode(IEnumerable source, ValueComparer elementComparer)
+    public static int GetHashCode(IEnumerable source, Func<TElement?, int> elementGetHashCode)
     {
         if (source is not IReadOnlyDictionary<string, TElement?> sourceDictionary)
         {
             throw new InvalidOperationException(
                 CosmosStrings.BadDictionaryType(
                     source.GetType().ShortDisplayName(),
-                    typeof(IList<>).MakeGenericType(elementComparer.Type).ShortDisplayName()));
+                    typeof(IList<>).MakeGenericType(typeof(TElement)).ShortDisplayName()));
         }
 
         var hash = new HashCode();
@@ -151,26 +145,26 @@ private static int GetHashCode(IEnumerable source, ValueComparer elementComparer
         foreach (var pair in sourceDictionary)
         {
             hash.Add(pair.Key);
-            hash.Add(pair.Value == null ? 0 : elementComparer.GetHashCode(pair.Value));
+            hash.Add(pair.Value == null ? 0 : elementGetHashCode(pair.Value));
         }
 
         return hash.ToHashCode();
     }
 
-    private static IReadOnlyDictionary<string, TElement?> Snapshot(object source, ValueComparer elementComparer)
+    public static IReadOnlyDictionary<string, TElement?> Snapshot(object source, Func<TElement?, TElement?> elementSnapshot)
     {
         if (source is not IReadOnlyDictionary<string, TElement?> sourceDictionary)
         {
             throw new InvalidOperationException(
                 CosmosStrings.BadDictionaryType(
                     source.GetType().ShortDisplayName(),
-                    typeof(IDictionary<,>).MakeGenericType(typeof(string), elementComparer.Type).ShortDisplayName()));
+                    typeof(IDictionary<,>).MakeGenericType(typeof(string), typeof(TElement)).ShortDisplayName()));
         }
 
         var snapshot = new Dictionary<string, TElement?>();
         foreach (var pair in sourceDictionary)
         {
-            snapshot[pair.Key] = pair.Value == null ? default : (TElement?)elementComparer.Snapshot(pair.Value);
+            snapshot[pair.Key] = pair.Value == null ? default : (TElement?)elementSnapshot(pair.Value);
         }
 
         return snapshot;
diff --git a/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs b/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs
index 25f36155528..253a7489bca 100644
--- a/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs
+++ b/src/EFCore.Cosmos/Storage/Internal/CosmosTypeMappingSource.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text.Json;
+using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Storage.Internal;
@@ -191,10 +192,10 @@ private static ValueComparer CreateStringDictionaryComparer(
         var unwrappedType = elementType.UnwrapNullableType();
 
         return (ValueComparer)Activator.CreateInstance(
-            elementType == unwrappedType
-                ? typeof(StringDictionaryComparer<,>).MakeGenericType(dictType, elementType)
-                : typeof(NullableStringDictionaryComparer<,>).MakeGenericType(unwrappedType, dictType),
-            elementMapping.Comparer)!;
+            typeof(StringDictionaryComparer<,>).MakeGenericType(dictType, elementType),
+#pragma warning disable EF1001 // Internal EF Core API usage.
+            elementMapping.Comparer.ComposeConversion(elementType))!;
+#pragma warning restore EF1001 // Internal EF Core API usage.
     }
 
     // This ensures that the element reader/writers are not null when using Cosmos dictionary type mappings, but
diff --git a/src/EFCore/ChangeTracking/Internal/ConvertingValueComparer.cs b/src/EFCore/ChangeTracking/Internal/ConvertingValueComparer.cs
new file mode 100644
index 00000000000..f5b58f0e265
--- /dev/null
+++ b/src/EFCore/ChangeTracking/Internal/ConvertingValueComparer.cs
@@ -0,0 +1,85 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
+
+using static Expression;
+
+/// <summary>
+///     A composable value comparer that accepts a value comparer, and exposes it as a value comparer for a base type.
+///     Used when a collection comparer over e.g. object[] is needed over a specific element type (e.g. int)
+/// </summary>
+/// <remarks>
+///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+///     any release. You should only use it directly in your code with extreme caution and knowing that
+///     doing so can result in application failures when updating to a new Entity Framework Core release.
+/// </remarks>
+public class ConvertingValueComparer<TTo, TFrom> : ValueComparer<TTo>, IInfrastructure<ValueComparer>
+{
+    private readonly ValueComparer<TFrom> _valueComparer;
+
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public ConvertingValueComparer(ValueComparer<TFrom> valueComparer)
+        : base(
+            CreateEquals(valueComparer),
+            CreateHashCode(valueComparer),
+            CreateSnapshot(valueComparer))
+        => _valueComparer = valueComparer;
+
+    private static Expression<Func<TTo?, TTo?, bool>> CreateEquals(ValueComparer<TFrom> valueComparer)
+    {
+        var p1 = Parameter(typeof(TTo), "v1");
+        var p2 = Parameter(typeof(TTo), "v2");
+
+        var body = typeof(TTo).IsAssignableFrom(typeof(TFrom))
+            ? valueComparer.EqualsExpression.Body
+            : valueComparer.ExtractEqualsBody(
+                Convert(p1, typeof(TFrom)),
+                Convert(p2, typeof(TFrom)));
+
+        return Lambda<Func<TTo?, TTo?, bool>>(
+            body,
+            p1,
+            p2);
+    }
+
+    private static Expression<Func<TTo, int>> CreateHashCode(ValueComparer<TFrom> valueComparer)
+    {
+        var p = Parameter(typeof(TTo), "v");
+
+        var body = typeof(TTo).IsAssignableFrom(typeof(TFrom))
+            ? valueComparer.HashCodeExpression.Body
+            : valueComparer.ExtractHashCodeBody(
+                Convert(p, typeof(TFrom)));
+
+        return Lambda<Func<TTo, int>>(
+            body,
+            p);
+    }
+
+    private static Expression<Func<TTo, TTo>> CreateSnapshot(ValueComparer<TFrom> valueComparer)
+    {
+        var p = Parameter(typeof(TTo), "v");
+
+        // types must match exactly as we have both covariance and contravariance case here
+        var body = typeof(TTo) == typeof(TFrom)
+            ? valueComparer.SnapshotExpression.Body
+            : Convert(
+                valueComparer.ExtractSnapshotBody(
+                    Convert(p, typeof(TFrom))),
+                typeof(TTo));
+
+        return Lambda<Func<TTo, TTo>>(
+            body,
+            p);
+    }
+
+    ValueComparer IInfrastructure<ValueComparer>.Instance
+        => _valueComparer;
+}
diff --git a/src/EFCore/ChangeTracking/Internal/ValueComparerExtensions.cs b/src/EFCore/ChangeTracking/Internal/ValueComparerExtensions.cs
index d5a17ac236f..bf199e20f08 100644
--- a/src/EFCore/ChangeTracking/Internal/ValueComparerExtensions.cs
+++ b/src/EFCore/ChangeTracking/Internal/ValueComparerExtensions.cs
@@ -25,4 +25,30 @@ public static class ValueComparerExtensions
                 : (ValueComparer)Activator.CreateInstance(
                     typeof(NullableValueComparer<>).MakeGenericType(valueComparer.Type),
                     valueComparer)!;
+
+    /// <summary>
+    ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+    ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+    ///     any release. You should only use it directly in your code with extreme caution and knowing that
+    ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+    /// </summary>
+    public static ValueComparer? ComposeConversion(this ValueComparer? valueComparer, Type targetClrType)
+    {
+        if (valueComparer is null || valueComparer.Type == targetClrType)
+        {
+            return valueComparer;
+        }
+
+        if (targetClrType.IsNullableValueType() && !valueComparer.Type.IsNullableValueType()
+            && targetClrType.UnwrapNullableType() == valueComparer.Type)
+        {
+            return (ValueComparer)Activator.CreateInstance(
+                typeof(NullableValueComparer<>).MakeGenericType(valueComparer.Type),
+                valueComparer)!;
+        }
+
+        return (ValueComparer)Activator.CreateInstance(
+            typeof(ConvertingValueComparer<,>).MakeGenericType(targetClrType, valueComparer.Type),
+            valueComparer)!;
+    }
 }
diff --git a/src/EFCore/ChangeTracking/ListOfNullableValueTypesComparer.cs b/src/EFCore/ChangeTracking/ListOfNullableValueTypesComparer.cs
index d95a40877db..90931a17b95 100644
--- a/src/EFCore/ChangeTracking/ListOfNullableValueTypesComparer.cs
+++ b/src/EFCore/ChangeTracking/ListOfNullableValueTypesComparer.cs
@@ -32,16 +32,16 @@ public sealed class ListOfNullableValueTypesComparer<TConcreteList, TElement> :
             && typeof(TConcreteList).GetGenericTypeDefinition() == typeof(ReadOnlyCollection<>));
 
     private static readonly MethodInfo CompareMethod = typeof(ListOfNullableValueTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(Compare), BindingFlags.Static | BindingFlags.NonPublic,
-        [typeof(IEnumerable<TElement?>), typeof(IEnumerable<TElement?>), typeof(ValueComparer<TElement?>)])!;
+        nameof(Compare), BindingFlags.Static | BindingFlags.Public,
+        [typeof(IEnumerable<TElement?>), typeof(IEnumerable<TElement?>), typeof(Func<TElement?, TElement?, bool>)])!;
 
     private static readonly MethodInfo GetHashCodeMethod = typeof(ListOfNullableValueTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(GetHashCode), BindingFlags.Static | BindingFlags.NonPublic,
-        [typeof(IEnumerable<TElement?>), typeof(ValueComparer<TElement?>)])!;
+        nameof(GetHashCode), BindingFlags.Static | BindingFlags.Public,
+        [typeof(IEnumerable<TElement?>), typeof(Func<TElement?, int>)])!;
 
     private static readonly MethodInfo SnapshotMethod = typeof(ListOfNullableValueTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(Snapshot), BindingFlags.Static | BindingFlags.NonPublic,
-        [typeof(IEnumerable<TElement?>), typeof(ValueComparer<TElement?>)])!;
+        nameof(Snapshot), BindingFlags.Static | BindingFlags.Public,
+        [typeof(IEnumerable<TElement?>), typeof(Func<TElement?, TElement?>)])!;
 
     /// <summary>
     ///     Creates a new instance of the list comparer.
@@ -67,15 +67,13 @@ ValueComparer IInfrastructure<ValueComparer>.Instance
         var prm1 = Expression.Parameter(typeof(IEnumerable<TElement?>), "a");
         var prm2 = Expression.Parameter(typeof(IEnumerable<TElement?>), "b");
 
-        //(a, b) => Compare(a, b, (ValueComparer<TElement?>)elementComparer)
+        //(a, b) => Compare(a, b, elementComparer.Equals)
         return Expression.Lambda<Func<IEnumerable<TElement?>?, IEnumerable<TElement?>?, bool>>(
             Expression.Call(
                 CompareMethod,
                 prm1,
                 prm2,
-                Expression.Convert(
-                    elementComparer.ConstructorExpression,
-                    typeof(ValueComparer<TElement?>))),
+                elementComparer.EqualsExpression),
             prm1,
             prm2);
     }
@@ -84,14 +82,12 @@ ValueComparer IInfrastructure<ValueComparer>.Instance
     {
         var prm = Expression.Parameter(typeof(IEnumerable<TElement?>), "o");
 
-        //o => GetHashCode(o, (ValueComparer<TElement?>)elementComparer)
+        //o => GetHashCode(o, elementComparer.GetHashCode)
         return Expression.Lambda<Func<IEnumerable<TElement?>, int>>(
             Expression.Call(
                 GetHashCodeMethod,
                 prm,
-                Expression.Convert(
-                    elementComparer.ConstructorExpression,
-                    typeof(ValueComparer<TElement?>))),
+                elementComparer.HashCodeExpression),
             prm);
     }
 
@@ -99,18 +95,16 @@ ValueComparer IInfrastructure<ValueComparer>.Instance
     {
         var prm = Expression.Parameter(typeof(IEnumerable<TElement?>), "source");
 
-        //source => Snapshot(source, (ValueComparer<TElement?>)elementComparer)
+        //source => Snapshot(source, elementComparer.Snapshot)
         return Expression.Lambda<Func<IEnumerable<TElement?>, IEnumerable<TElement?>>>(
             Expression.Call(
                 SnapshotMethod,
                 prm,
-                Expression.Convert(
-                    elementComparer.ConstructorExpression,
-                    typeof(ValueComparer<TElement?>))),
+                elementComparer.SnapshotExpression),
             prm);
     }
 
-    private static bool Compare(IEnumerable<TElement?>? a, IEnumerable<TElement?>? b, ValueComparer<TElement?> elementComparer)
+    public static bool Compare(IEnumerable<TElement?>? a, IEnumerable<TElement?>? b, Func<TElement?, TElement?, bool> elementCompare)
     {
         if (ReferenceEquals(a, b))
         {
@@ -152,7 +146,7 @@ private static bool Compare(IEnumerable<TElement?>? a, IEnumerable<TElement?>? b
                     return false;
                 }
 
-                if (!elementComparer.Equals(el1, el2))
+                if (!elementCompare(el1, el2))
                 {
                     return false;
                 }
@@ -164,29 +158,29 @@ private static bool Compare(IEnumerable<TElement?>? a, IEnumerable<TElement?>? b
         throw new InvalidOperationException(
             CoreStrings.BadListType(
                 (a is IList<TElement?> ? b : a).GetType().ShortDisplayName(),
-                typeof(IList<>).MakeGenericType(elementComparer.Type.MakeNullable()).ShortDisplayName()));
+                typeof(IList<>).MakeGenericType(typeof(TElement).MakeNullable()).ShortDisplayName()));
     }
 
-    private static int GetHashCode(IEnumerable<TElement?> source, ValueComparer<TElement?> elementComparer)
+    public static int GetHashCode(IEnumerable<TElement?> source, Func<TElement?, int> elementGetHashCode)
     {
         var hash = new HashCode();
 
         foreach (var el in source)
         {
-            hash.Add(el == null ? 0 : elementComparer.GetHashCode(el));
+            hash.Add(el == null ? 0 : elementGetHashCode(el));
         }
 
         return hash.ToHashCode();
     }
 
-    private static IList<TElement?> Snapshot(IEnumerable<TElement?> source, ValueComparer<TElement?> elementComparer)
+    public static IList<TElement?> Snapshot(IEnumerable<TElement?> source, Func<TElement?, TElement?> elementSnapshot)
     {
         if (source is not IList<TElement?> sourceList)
         {
             throw new InvalidOperationException(
                 CoreStrings.BadListType(
                     source.GetType().ShortDisplayName(),
-                    typeof(IList<>).MakeGenericType(elementComparer.Type.MakeNullable()).ShortDisplayName()));
+                    typeof(IList<>).MakeGenericType(typeof(TElement).MakeNullable()).ShortDisplayName()));
         }
 
         if (IsArray)
@@ -195,7 +189,7 @@ private static int GetHashCode(IEnumerable<TElement?> source, ValueComparer<TEle
             for (var i = 0; i < sourceList.Count; i++)
             {
                 var instance = sourceList[i];
-                snapshot[i] = instance == null ? null : elementComparer.Snapshot(instance);
+                snapshot[i] = instance == null ? null : elementSnapshot(instance);
             }
 
             return snapshot;
@@ -205,7 +199,7 @@ private static int GetHashCode(IEnumerable<TElement?> source, ValueComparer<TEle
             var snapshot = IsReadOnly ? new List<TElement?>() : (IList<TElement?>)Activator.CreateInstance<TConcreteList>()!;
             foreach (var e in sourceList)
             {
-                snapshot.Add(e == null ? null : elementComparer.Snapshot(e));
+                snapshot.Add(e == null ? null : elementSnapshot(e));
             }
 
             return IsReadOnly
diff --git a/src/EFCore/ChangeTracking/ListOfReferenceTypesComparer.cs b/src/EFCore/ChangeTracking/ListOfReferenceTypesComparer.cs
index e0e77528d87..965775070d8 100644
--- a/src/EFCore/ChangeTracking/ListOfReferenceTypesComparer.cs
+++ b/src/EFCore/ChangeTracking/ListOfReferenceTypesComparer.cs
@@ -30,13 +30,13 @@ public sealed class ListOfReferenceTypesComparer<TConcreteList, TElement> : Valu
             && typeof(TConcreteList).GetGenericTypeDefinition() == typeof(ReadOnlyCollection<>));
 
     private static readonly MethodInfo CompareMethod = typeof(ListOfReferenceTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(Compare), BindingFlags.Static | BindingFlags.NonPublic, [typeof(object), typeof(object), typeof(ValueComparer)])!;
+        nameof(Compare), BindingFlags.Static | BindingFlags.Public, [typeof(object), typeof(object), typeof(Func<TElement, TElement, bool>)])!;
 
     private static readonly MethodInfo GetHashCodeMethod = typeof(ListOfReferenceTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(GetHashCode), BindingFlags.Static | BindingFlags.NonPublic, [typeof(IEnumerable), typeof(ValueComparer)])!;
+        nameof(GetHashCode), BindingFlags.Static | BindingFlags.Public, [typeof(IEnumerable), typeof(Func<TElement, int>)])!;
 
     private static readonly MethodInfo SnapshotMethod = typeof(ListOfReferenceTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(Snapshot), BindingFlags.Static | BindingFlags.NonPublic, [typeof(object), typeof(ValueComparer)])!;
+        nameof(Snapshot), BindingFlags.Static | BindingFlags.Public, [typeof(object), typeof(Func<TElement, TElement>)])!;
 
     /// <summary>
     ///     Creates a new instance of the list comparer.
@@ -62,13 +62,12 @@ ValueComparer IInfrastructure<ValueComparer>.Instance
         var prm1 = Expression.Parameter(typeof(object), "a");
         var prm2 = Expression.Parameter(typeof(object), "b");
 
-        // (a, b) => Compare(a, b, elementComparer)
         return Expression.Lambda<Func<object?, object?, bool>>(
             Expression.Call(
                 CompareMethod,
                 prm1,
                 prm2,
-                elementComparer.ConstructorExpression),
+                elementComparer.EqualsExpression),
             prm1,
             prm2);
     }
@@ -77,14 +76,13 @@ private static Expression<Func<object, int>> GetHashCodeLambda(ValueComparer ele
     {
         var prm = Expression.Parameter(typeof(object), "o");
 
-        //o => GetHashCode((IEnumerable)o, elementComparer)
         return Expression.Lambda<Func<object, int>>(
             Expression.Call(
                 GetHashCodeMethod,
                 Expression.Convert(
                     prm,
                     typeof(IEnumerable)),
-                elementComparer.ConstructorExpression),
+                elementComparer.HashCodeExpression),
             prm);
     }
 
@@ -92,16 +90,15 @@ private static Expression<Func<object, object>> SnapshotLambda(ValueComparer ele
     {
         var prm = Expression.Parameter(typeof(object), "source");
 
-        //source => Snapshot(source, elementComparer)
         return Expression.Lambda<Func<object, object>>(
             Expression.Call(
                 SnapshotMethod,
                 prm,
-                elementComparer.ConstructorExpression),
+                elementComparer.SnapshotExpression),
             prm);
     }
 
-    private static bool Compare(object? a, object? b, ValueComparer elementComparer)
+    public static bool Compare(object? a, object? b, Func<TElement?, TElement?, bool> elementCompare)
     {
         if (ReferenceEquals(a, b))
         {
@@ -143,7 +140,7 @@ private static bool Compare(object? a, object? b, ValueComparer elementComparer)
                     return false;
                 }
 
-                if (!elementComparer.Equals(el1, el2))
+                if (!elementCompare(el1, el2))
                 {
                     return false;
                 }
@@ -155,29 +152,29 @@ private static bool Compare(object? a, object? b, ValueComparer elementComparer)
         throw new InvalidOperationException(
             CoreStrings.BadListType(
                 (a is IList<TElement?> ? b : a).GetType().ShortDisplayName(),
-                typeof(IList<>).MakeGenericType(elementComparer.Type).ShortDisplayName()));
+                typeof(IList<>).MakeGenericType(typeof(TElement)).ShortDisplayName()));
     }
 
-    private static int GetHashCode(IEnumerable source, ValueComparer elementComparer)
+    public static int GetHashCode(IEnumerable source, Func<TElement?, int> elementGetHashCode)
     {
         var hash = new HashCode();
 
         foreach (var el in source)
         {
-            hash.Add(el == null ? 0 : elementComparer.GetHashCode(el));
+            hash.Add(el == null ? 0 : elementGetHashCode((TElement?)el));
         }
 
         return hash.ToHashCode();
     }
 
-    private static IList<TElement?> Snapshot(object source, ValueComparer elementComparer)
+    public static IList<TElement?> Snapshot(object source, Func<TElement?, TElement?> elementSnapshot)
     {
         if (source is not IList<TElement?> sourceList)
         {
             throw new InvalidOperationException(
                 CoreStrings.BadListType(
                     source.GetType().ShortDisplayName(),
-                    typeof(IList<>).MakeGenericType(elementComparer.Type).ShortDisplayName()));
+                    typeof(IList<>).MakeGenericType(typeof(TElement)).ShortDisplayName()));
         }
 
         if (IsArray)
@@ -186,7 +183,7 @@ private static int GetHashCode(IEnumerable source, ValueComparer elementComparer
             for (var i = 0; i < sourceList.Count; i++)
             {
                 var instance = sourceList[i];
-                snapshot[i] = instance == null ? null : (TElement?)elementComparer.Snapshot(instance);
+                snapshot[i] = instance == null ? null : elementSnapshot(instance);
             }
 
             return snapshot;
@@ -196,7 +193,7 @@ private static int GetHashCode(IEnumerable source, ValueComparer elementComparer
             var snapshot = IsReadOnly ? new List<TElement?>() : (IList<TElement?>)Activator.CreateInstance<TConcreteList>()!;
             foreach (var e in sourceList)
             {
-                snapshot.Add(e == null ? null : (TElement?)elementComparer.Snapshot(e));
+                snapshot.Add(e == null ? null : elementSnapshot(e));
             }
 
             return IsReadOnly
diff --git a/src/EFCore/ChangeTracking/ListOfValueTypesComparer.cs b/src/EFCore/ChangeTracking/ListOfValueTypesComparer.cs
index 19a3a8d4a2f..ed9fbc1caa7 100644
--- a/src/EFCore/ChangeTracking/ListOfValueTypesComparer.cs
+++ b/src/EFCore/ChangeTracking/ListOfValueTypesComparer.cs
@@ -30,15 +30,15 @@ public sealed class ListOfValueTypesComparer<TConcreteList, TElement> : ValueCom
             && typeof(TConcreteList).GetGenericTypeDefinition() == typeof(ReadOnlyCollection<>));
 
     private static readonly MethodInfo CompareMethod = typeof(ListOfValueTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(Compare), BindingFlags.Static | BindingFlags.NonPublic,
-        [typeof(IEnumerable<TElement>), typeof(IEnumerable<TElement>), typeof(ValueComparer<TElement>)])!;
+        nameof(Compare), BindingFlags.Static | BindingFlags.Public,
+        [typeof(IEnumerable<TElement>), typeof(IEnumerable<TElement>), typeof(Func<TElement, TElement, bool>)])!;
 
     private static readonly MethodInfo GetHashCodeMethod = typeof(ListOfValueTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(GetHashCode), BindingFlags.Static | BindingFlags.NonPublic,
-        [typeof(IEnumerable<TElement>), typeof(ValueComparer<TElement>)])!;
+        nameof(GetHashCode), BindingFlags.Static | BindingFlags.Public,
+        [typeof(IEnumerable<TElement>), typeof(Func<TElement, int>)])!;
 
     private static readonly MethodInfo SnapshotMethod = typeof(ListOfValueTypesComparer<TConcreteList, TElement>).GetMethod(
-        nameof(Snapshot), BindingFlags.Static | BindingFlags.NonPublic, [typeof(IEnumerable<TElement>), typeof(ValueComparer<TElement>)])!;
+        nameof(Snapshot), BindingFlags.Static | BindingFlags.Public, [typeof(IEnumerable<TElement>), typeof(Func<TElement, TElement>)])!;
 
     /// <summary>
     ///     Creates a new instance of the list comparer.
@@ -64,15 +64,13 @@ ValueComparer IInfrastructure<ValueComparer>.Instance
         var prm1 = Expression.Parameter(typeof(IEnumerable<TElement>), "a");
         var prm2 = Expression.Parameter(typeof(IEnumerable<TElement>), "b");
 
-        //(a, b) => Compare(a, b, (ValueComparer<TElement>)elementComparer)
+        //(a, b) => Compare(a, b, elementComparer.Equals)
         return Expression.Lambda<Func<IEnumerable<TElement>?, IEnumerable<TElement>?, bool>>(
             Expression.Call(
                 CompareMethod,
                 prm1,
                 prm2,
-                Expression.Convert(
-                    elementComparer.ConstructorExpression,
-                    typeof(ValueComparer<TElement>))),
+                elementComparer.EqualsExpression),
             prm1,
             prm2);
     }
@@ -81,14 +79,12 @@ private static Expression<Func<IEnumerable<TElement>, int>> GetHashCodeLambda(Va
     {
         var prm = Expression.Parameter(typeof(IEnumerable<TElement>), "o");
 
-        //o => GetHashCode(o, (ValueComparer<TElement>)elementComparer)
+        //o => GetHashCode(o, elementComparer.GetHashCode)
         return Expression.Lambda<Func<IEnumerable<TElement>, int>>(
             Expression.Call(
                 GetHashCodeMethod,
                 prm,
-                Expression.Convert(
-                    elementComparer.ConstructorExpression,
-                    typeof(ValueComparer<TElement>))),
+                elementComparer.HashCodeExpression),
             prm);
     }
 
@@ -96,18 +92,16 @@ private static Expression<Func<IEnumerable<TElement>, IEnumerable<TElement>>> Sn
     {
         var prm = Expression.Parameter(typeof(IEnumerable<TElement>), "source");
 
-        //source => Snapshot(source, (ValueComparer<TElement>)elementComparer)
+        //source => Snapshot(source, elementComparer.Snapshot)
         return Expression.Lambda<Func<IEnumerable<TElement>, IEnumerable<TElement>>>(
             Expression.Call(
                 SnapshotMethod,
                 prm,
-                Expression.Convert(
-                    elementComparer.ConstructorExpression,
-                    typeof(ValueComparer<TElement>))),
+                elementComparer.SnapshotExpression),
             prm);
     }
 
-    private static bool Compare(IEnumerable<TElement>? a, IEnumerable<TElement>? b, ValueComparer<TElement> elementComparer)
+    public static bool Compare(IEnumerable<TElement>? a, IEnumerable<TElement>? b, Func<TElement, TElement, bool> elementCompare)
     {
         if (ReferenceEquals(a, b))
         {
@@ -134,7 +128,7 @@ private static bool Compare(IEnumerable<TElement>? a, IEnumerable<TElement>? b,
             for (var i = 0; i < aList.Count; i++)
             {
                 var (el1, el2) = (aList[i], bList[i]);
-                if (!elementComparer.Equals(el1, el2))
+                if (!elementCompare(el1, el2))
                 {
                     return false;
                 }
@@ -146,29 +140,29 @@ private static bool Compare(IEnumerable<TElement>? a, IEnumerable<TElement>? b,
         throw new InvalidOperationException(
             CoreStrings.BadListType(
                 (a is IList<TElement?> ? b : a).GetType().ShortDisplayName(),
-                typeof(IList<>).MakeGenericType(elementComparer.Type).ShortDisplayName()));
+                typeof(IList<>).MakeGenericType(typeof(TElement)).ShortDisplayName()));
     }
 
-    private static int GetHashCode(IEnumerable<TElement> source, ValueComparer<TElement> elementComparer)
+    public static int GetHashCode(IEnumerable<TElement> source, Func<TElement, int> elementGetHashCode)
     {
         var hash = new HashCode();
 
         foreach (var el in source)
         {
-            hash.Add(elementComparer.GetHashCode(el));
+            hash.Add(elementGetHashCode(el));
         }
 
         return hash.ToHashCode();
     }
 
-    private static IList<TElement> Snapshot(IEnumerable<TElement> source, ValueComparer<TElement> elementComparer)
+    public static IList<TElement> Snapshot(IEnumerable<TElement> source, Func<TElement, TElement> elementSnapshot)
     {
         if (source is not IList<TElement> sourceList)
         {
             throw new InvalidOperationException(
                 CoreStrings.BadListType(
                     source.GetType().ShortDisplayName(),
-                    typeof(IList<>).MakeGenericType(elementComparer.Type.MakeNullable()).ShortDisplayName()));
+                    typeof(IList<>).MakeGenericType(typeof(TElement).MakeNullable()).ShortDisplayName()));
         }
 
         if (IsArray)
@@ -177,7 +171,7 @@ private static IList<TElement> Snapshot(IEnumerable<TElement> source, ValueCompa
             for (var i = 0; i < sourceList.Count; i++)
             {
                 var instance = sourceList[i];
-                snapshot[i] = elementComparer.Snapshot(instance);
+                snapshot[i] = elementSnapshot(instance);
             }
 
             return snapshot;
@@ -187,7 +181,7 @@ private static IList<TElement> Snapshot(IEnumerable<TElement> source, ValueCompa
             var snapshot = IsReadOnly ? new List<TElement>() : (IList<TElement>)Activator.CreateInstance<TConcreteList>()!;
             foreach (var e in sourceList)
             {
-                snapshot.Add(elementComparer.Snapshot(e));
+                snapshot.Add(elementSnapshot(e));
             }
 
             return IsReadOnly
diff --git a/src/EFCore/Storage/TypeMappingSourceBase.cs b/src/EFCore/Storage/TypeMappingSourceBase.cs
index b38c0e7462e..5474e119f7a 100644
--- a/src/EFCore/Storage/TypeMappingSourceBase.cs
+++ b/src/EFCore/Storage/TypeMappingSourceBase.cs
@@ -179,7 +179,7 @@ protected virtual bool TryFindJsonCollectionMapping(
                         : elementType.IsValueType
                             ? typeof(ListOfValueTypesComparer<,>).MakeGenericType(typeToInstantiate, elementType)
                             : typeof(ListOfReferenceTypesComparer<,>).MakeGenericType(typeToInstantiate, elementType),
-                    elementMapping.Comparer.ToNullableComparer(elementType)!);
+                    elementMapping.Comparer.ComposeConversion(elementType)!);
 
                 return true;
 
diff --git a/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/Basic_cosmos_model/DataEntityType.cs b/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/Basic_cosmos_model/DataEntityType.cs
index 09e7d8fa59c..b68e3df3cff 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/Basic_cosmos_model/DataEntityType.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/Basic_cosmos_model/DataEntityType.cs
@@ -212,10 +212,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             list.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<List<Dictionary<string, int>>, Dictionary<string, int>>(new StringDictionaryComparer<Dictionary<string, int>, int>(new ValueComparer<int>(
-                    bool (int v1, int v2) => v1 == v2,
-                    int (int v) => v,
-                    int (int v) => v))),
+                comparer: new ListOfReferenceTypesComparer<List<Dictionary<string, int>>, Dictionary<string, int>>(new ValueComparer<Dictionary<string, int>>(
+                    bool (Dictionary<string, int> v1, Dictionary<string, int> v2) => StringDictionaryComparer<Dictionary<string, int>, int>.Compare(((object)(v1)), ((object)(v2)), bool (int v1, int v2) => v1 == v2),
+                    int (Dictionary<string, int> v) => StringDictionaryComparer<Dictionary<string, int>, int>.GetHashCode(((IEnumerable)(((object)(v)))), int (int v) => v),
+                    Dictionary<string, int> (Dictionary<string, int> v) => ((Dictionary<string, int>)(StringDictionaryComparer<Dictionary<string, int>, int>.Snapshot(((object)(v)), int (int v) => v))))),
                 keyComparer: new ValueComparer<List<Dictionary<string, int>>>(
                     bool (List<Dictionary<string, int>> v1, List<Dictionary<string, int>> v2) => object.Equals(v1, v2),
                     int (List<Dictionary<string, int>> v) => ((object)v).GetHashCode(),
@@ -262,10 +262,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             map.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new StringDictionaryComparer<Dictionary<string, string[]>, string[]>(new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
-                    bool (string v1, string v2) => v1 == v2,
-                    int (string v) => ((object)v).GetHashCode(),
-                    string (string v) => v))),
+                comparer: new StringDictionaryComparer<Dictionary<string, string[]>, string[]>(new ValueComparer<string[]>(
+                    bool (string[] v1, string[] v2) => ListOfReferenceTypesComparer<string[], string>.Compare(((object)(v1)), ((object)(v2)), bool (string v1, string v2) => v1 == v2),
+                    int (string[] v) => ListOfReferenceTypesComparer<string[], string>.GetHashCode(((IEnumerable)(((object)(v)))), int (string v) => ((object)v).GetHashCode()),
+                    string[] (string[] v) => ((string[])(ListOfReferenceTypesComparer<string[], string>.Snapshot(((object)(v)), string (string v) => v))))),
                 keyComparer: new ValueComparer<Dictionary<string, string[]>>(
                     bool (Dictionary<string, string[]> v1, Dictionary<string, string[]> v2) => object.Equals(v1, v2),
                     int (Dictionary<string, string[]> v) => ((object)v).GetHashCode(),
diff --git a/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs b/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
index 7deabfede83..19d94ae2936 100644
--- a/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
+++ b/test/EFCore.Cosmos.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs
@@ -256,10 +256,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             boolNestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<bool[][], bool[]>(new ListOfValueTypesComparer<bool[], bool>(new ValueComparer<bool>(
-                    bool (bool v1, bool v2) => v1 == v2,
-                    int (bool v) => ((object)v).GetHashCode(),
-                    bool (bool v) => v))),
+                comparer: new ListOfReferenceTypesComparer<bool[][], bool[]>(new ValueComparer<bool[]>(
+                    bool (bool[] v1, bool[] v2) => ListOfValueTypesComparer<bool[], bool>.Compare(((IEnumerable<bool>)(v1)), ((IEnumerable<bool>)(v2)), bool (bool v1, bool v2) => v1 == v2),
+                    int (bool[] v) => ListOfValueTypesComparer<bool[], bool>.GetHashCode(((IEnumerable<bool>)(v)), int (bool v) => ((object)v).GetHashCode()),
+                    bool[] (bool[] v) => ((bool[])(ListOfValueTypesComparer<bool[], bool>.Snapshot(((IEnumerable<bool>)(v)), bool (bool v) => v))))),
                 keyComparer: new ValueComparer<bool[][]>(
                     bool (bool[][] v1, bool[][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (bool[][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -786,10 +786,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             charNestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<char[][], char[]>(new ListOfValueTypesComparer<char[], char>(new ValueComparer<char>(
-                    bool (char v1, char v2) => v1 == v2,
-                    int (char v) => ((int)(v)),
-                    char (char v) => v))),
+                comparer: new ListOfReferenceTypesComparer<char[][], char[]>(new ValueComparer<char[]>(
+                    bool (char[] v1, char[] v2) => ListOfValueTypesComparer<char[], char>.Compare(((IEnumerable<char>)(v1)), ((IEnumerable<char>)(v2)), bool (char v1, char v2) => v1 == v2),
+                    int (char[] v) => ListOfValueTypesComparer<char[], char>.GetHashCode(((IEnumerable<char>)(v)), int (char v) => ((int)(v))),
+                    char[] (char[] v) => ((char[])(ListOfValueTypesComparer<char[], char>.Snapshot(((IEnumerable<char>)(v)), char (char v) => v))))),
                 keyComparer: new ValueComparer<char[][]>(
                     bool (char[][] v1, char[][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (char[][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -3232,10 +3232,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             int32NestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<int[][], int[]>(new ListOfValueTypesComparer<int[], int>(new ValueComparer<int>(
-                    bool (int v1, int v2) => v1 == v2,
-                    int (int v) => v,
-                    int (int v) => v))),
+                comparer: new ListOfReferenceTypesComparer<int[][], int[]>(new ValueComparer<int[]>(
+                    bool (int[] v1, int[] v2) => ListOfValueTypesComparer<int[], int>.Compare(((IEnumerable<int>)(v1)), ((IEnumerable<int>)(v2)), bool (int v1, int v2) => v1 == v2),
+                    int (int[] v) => ListOfValueTypesComparer<int[], int>.GetHashCode(((IEnumerable<int>)(v)), int (int v) => v),
+                    int[] (int[] v) => ((int[])(ListOfValueTypesComparer<int[], int>.Snapshot(((IEnumerable<int>)(v)), int (int v) => v))))),
                 keyComparer: new ValueComparer<int[][]>(
                     bool (int[][] v1, int[][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (int[][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -3466,10 +3466,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             int64NestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<IList<long[]>[], IList<long[]>>(new ListOfReferenceTypesComparer<List<long[]>, long[]>(new ListOfValueTypesComparer<long[], long>(new ValueComparer<long>(
-                    bool (long v1, long v2) => v1 == v2,
-                    int (long v) => ((object)v).GetHashCode(),
-                    long (long v) => v)))),
+                comparer: new ListOfReferenceTypesComparer<IList<long[]>[], IList<long[]>>(new ValueComparer<IList<long[]>>(
+                    bool (IList<long[]> v1, IList<long[]> v2) => ListOfReferenceTypesComparer<List<long[]>, long[]>.Compare(((object)(v1)), ((object)(v2)), bool (long[] v1, long[] v2) => ListOfValueTypesComparer<long[], long>.Compare(((IEnumerable<long>)(v1)), ((IEnumerable<long>)(v2)), bool (long v1, long v2) => v1 == v2)),
+                    int (IList<long[]> v) => ListOfReferenceTypesComparer<List<long[]>, long[]>.GetHashCode(((IEnumerable)(((object)(v)))), int (long[] v) => ListOfValueTypesComparer<long[], long>.GetHashCode(((IEnumerable<long>)(v)), int (long v) => ((object)v).GetHashCode())),
+                    IList<long[]> (IList<long[]> v) => ((IList<long[]>)(ListOfReferenceTypesComparer<List<long[]>, long[]>.Snapshot(((object)(v)), long[] (long[] v) => ((long[])(ListOfValueTypesComparer<long[], long>.Snapshot(((IEnumerable<long>)(v)), long (long v) => v)))))))),
                 keyComparer: new ValueComparer<IList<long[]>[]>(
                     bool (IList<long[]>[] v1, IList<long[]>[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (IList<long[]>[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -3484,10 +3484,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                         new JsonCollectionOfStructsReaderWriter<long[], long>(
                             JsonInt64ReaderWriter.Instance))),
                 elementMapping: CosmosTypeMapping.Default.Clone(
-                    comparer: new ListOfReferenceTypesComparer<List<long[]>, long[]>(new ListOfValueTypesComparer<long[], long>(new ValueComparer<long>(
-                        bool (long v1, long v2) => v1 == v2,
-                        int (long v) => ((object)v).GetHashCode(),
-                        long (long v) => v))),
+                    comparer: new ListOfReferenceTypesComparer<List<long[]>, long[]>(new ValueComparer<long[]>(
+                        bool (long[] v1, long[] v2) => ListOfValueTypesComparer<long[], long>.Compare(((IEnumerable<long>)(v1)), ((IEnumerable<long>)(v2)), bool (long v1, long v2) => v1 == v2),
+                        int (long[] v) => ListOfValueTypesComparer<long[], long>.GetHashCode(((IEnumerable<long>)(v)), int (long v) => ((object)v).GetHashCode()),
+                        long[] (long[] v) => ((long[])(ListOfValueTypesComparer<long[], long>.Snapshot(((IEnumerable<long>)(v)), long (long v) => v))))),
                     keyComparer: new ValueComparer<IList<long[]>>(
                         bool (IList<long[]> v1, IList<long[]> v2) => object.Equals(v1, v2),
                         int (IList<long[]> v) => ((object)v).GetHashCode(),
@@ -3660,10 +3660,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             int8NestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<sbyte[][][], sbyte[][]>(new ListOfReferenceTypesComparer<sbyte[][], sbyte[]>(new ListOfValueTypesComparer<sbyte[], sbyte>(new ValueComparer<sbyte>(
-                    bool (sbyte v1, sbyte v2) => v1 == v2,
-                    int (sbyte v) => ((int)(v)),
-                    sbyte (sbyte v) => v)))),
+                comparer: new ListOfReferenceTypesComparer<sbyte[][][], sbyte[][]>(new ValueComparer<sbyte[][]>(
+                    bool (sbyte[][] v1, sbyte[][] v2) => ListOfReferenceTypesComparer<sbyte[][], sbyte[]>.Compare(((object)(v1)), ((object)(v2)), bool (sbyte[] v1, sbyte[] v2) => ListOfValueTypesComparer<sbyte[], sbyte>.Compare(((IEnumerable<sbyte>)(v1)), ((IEnumerable<sbyte>)(v2)), bool (sbyte v1, sbyte v2) => v1 == v2)),
+                    int (sbyte[][] v) => ListOfReferenceTypesComparer<sbyte[][], sbyte[]>.GetHashCode(((IEnumerable)(((object)(v)))), int (sbyte[] v) => ListOfValueTypesComparer<sbyte[], sbyte>.GetHashCode(((IEnumerable<sbyte>)(v)), int (sbyte v) => ((int)(v)))),
+                    sbyte[][] (sbyte[][] v) => ((sbyte[][])(ListOfReferenceTypesComparer<sbyte[][], sbyte[]>.Snapshot(((object)(v)), sbyte[] (sbyte[] v) => ((sbyte[])(ListOfValueTypesComparer<sbyte[], sbyte>.Snapshot(((IEnumerable<sbyte>)(v)), sbyte (sbyte v) => v)))))))),
                 keyComparer: new ValueComparer<sbyte[][][]>(
                     bool (sbyte[][][] v1, sbyte[][][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (sbyte[][][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -3678,10 +3678,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                         new JsonCollectionOfStructsReaderWriter<sbyte[], sbyte>(
                             JsonSByteReaderWriter.Instance))),
                 elementMapping: CosmosTypeMapping.Default.Clone(
-                    comparer: new ListOfReferenceTypesComparer<sbyte[][], sbyte[]>(new ListOfValueTypesComparer<sbyte[], sbyte>(new ValueComparer<sbyte>(
-                        bool (sbyte v1, sbyte v2) => v1 == v2,
-                        int (sbyte v) => ((int)(v)),
-                        sbyte (sbyte v) => v))),
+                    comparer: new ListOfReferenceTypesComparer<sbyte[][], sbyte[]>(new ValueComparer<sbyte[]>(
+                        bool (sbyte[] v1, sbyte[] v2) => ListOfValueTypesComparer<sbyte[], sbyte>.Compare(((IEnumerable<sbyte>)(v1)), ((IEnumerable<sbyte>)(v2)), bool (sbyte v1, sbyte v2) => v1 == v2),
+                        int (sbyte[] v) => ListOfValueTypesComparer<sbyte[], sbyte>.GetHashCode(((IEnumerable<sbyte>)(v)), int (sbyte v) => ((int)(v))),
+                        sbyte[] (sbyte[] v) => ((sbyte[])(ListOfValueTypesComparer<sbyte[], sbyte>.Snapshot(((IEnumerable<sbyte>)(v)), sbyte (sbyte v) => v))))),
                     keyComparer: new ValueComparer<sbyte[][]>(
                         bool (sbyte[][] v1, sbyte[][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                         int (sbyte[][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -5681,10 +5681,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             nullableInt32NestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<int?[][], int?[]>(new ListOfNullableValueTypesComparer<int?[], int>(new NullableValueComparer<int>(new ValueComparer<int>(
-                    bool (int v1, int v2) => v1 == v2,
-                    int (int v) => v,
-                    int (int v) => v)))),
+                comparer: new ListOfReferenceTypesComparer<int?[][], int?[]>(new ValueComparer<int?[]>(
+                    bool (int? [] v1, int? [] v2) => ListOfNullableValueTypesComparer<int? [], int>.Compare(((IEnumerable<int?>)(v1)), ((IEnumerable<int?>)(v2)), bool (int? v1, int? v2) => v1.HasValue && v2.HasValue && ((int)(v1)) == ((int)(v2)) || !(v1.HasValue) && !(v2.HasValue)),
+                    int (int? [] v) => ListOfNullableValueTypesComparer<int? [], int>.GetHashCode(((IEnumerable<int?>)(v)), int (int? v) => (v.HasValue ? ((int)(v)) : 0)),
+                    int? [] (int? [] v) => ((int? [])(ListOfNullableValueTypesComparer<int? [], int>.Snapshot(((IEnumerable<int?>)(v)), int? (int? v) => (v.HasValue ? ((int? )(((int)(v)))) : default(int? ))))))),
                 keyComparer: new ValueComparer<int?[][]>(
                     bool (int? [][] v1, int? [][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (int? [][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -5859,10 +5859,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             nullableInt64NestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<List<long?[][]>, long?[][]>(new ListOfReferenceTypesComparer<long?[][], long?[]>(new ListOfNullableValueTypesComparer<long?[], long>(new NullableValueComparer<long>(new ValueComparer<long>(
-                    bool (long v1, long v2) => v1 == v2,
-                    int (long v) => ((object)v).GetHashCode(),
-                    long (long v) => v))))),
+                comparer: new ListOfReferenceTypesComparer<List<long?[][]>, long?[][]>(new ValueComparer<long?[][]>(
+                    bool (long? [][] v1, long? [][] v2) => ListOfReferenceTypesComparer<long? [][], long? []>.Compare(((object)(v1)), ((object)(v2)), bool (long? [] v1, long? [] v2) => ListOfNullableValueTypesComparer<long? [], long>.Compare(((IEnumerable<long?>)(v1)), ((IEnumerable<long?>)(v2)), bool (long? v1, long? v2) => v1.HasValue && v2.HasValue && ((long)(v1)) == ((long)(v2)) || !(v1.HasValue) && !(v2.HasValue))),
+                    int (long? [][] v) => ListOfReferenceTypesComparer<long? [][], long? []>.GetHashCode(((IEnumerable)(((object)(v)))), int (long? [] v) => ListOfNullableValueTypesComparer<long? [], long>.GetHashCode(((IEnumerable<long?>)(v)), int (long? v) => (v.HasValue ? ((object)((long)(v))).GetHashCode() : 0))),
+                    long? [][] (long? [][] v) => ((long? [][])(ListOfReferenceTypesComparer<long? [][], long? []>.Snapshot(((object)(v)), long? [] (long? [] v) => ((long? [])(ListOfNullableValueTypesComparer<long? [], long>.Snapshot(((IEnumerable<long?>)(v)), long? (long? v) => (v.HasValue ? ((long? )(((long)(v)))) : default(long? )))))))))),
                 keyComparer: new ValueComparer<List<long?[][]>>(
                     bool (List<long? [][]> v1, List<long? [][]> v2) => object.Equals(v1, v2),
                     int (List<long? [][]> v) => ((object)v).GetHashCode(),
@@ -5877,10 +5877,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                         new JsonCollectionOfNullableStructsReaderWriter<long?[], long>(
                             JsonInt64ReaderWriter.Instance))),
                 elementMapping: CosmosTypeMapping.Default.Clone(
-                    comparer: new ListOfReferenceTypesComparer<long?[][], long?[]>(new ListOfNullableValueTypesComparer<long?[], long>(new NullableValueComparer<long>(new ValueComparer<long>(
-                        bool (long v1, long v2) => v1 == v2,
-                        int (long v) => ((object)v).GetHashCode(),
-                        long (long v) => v)))),
+                    comparer: new ListOfReferenceTypesComparer<long?[][], long?[]>(new ValueComparer<long?[]>(
+                        bool (long? [] v1, long? [] v2) => ListOfNullableValueTypesComparer<long? [], long>.Compare(((IEnumerable<long?>)(v1)), ((IEnumerable<long?>)(v2)), bool (long? v1, long? v2) => v1.HasValue && v2.HasValue && ((long)(v1)) == ((long)(v2)) || !(v1.HasValue) && !(v2.HasValue)),
+                        int (long? [] v) => ListOfNullableValueTypesComparer<long? [], long>.GetHashCode(((IEnumerable<long?>)(v)), int (long? v) => (v.HasValue ? ((object)((long)(v))).GetHashCode() : 0)),
+                        long? [] (long? [] v) => ((long? [])(ListOfNullableValueTypesComparer<long? [], long>.Snapshot(((IEnumerable<long?>)(v)), long? (long? v) => (v.HasValue ? ((long? )(((long)(v)))) : default(long? ))))))),
                     keyComparer: new ValueComparer<long?[][]>(
                         bool (long? [][] v1, long? [][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                         int (long? [][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -6205,10 +6205,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             nullableStringNestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<string[][], string[]>(new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
-                    bool (string v1, string v2) => v1 == v2,
-                    int (string v) => ((object)v).GetHashCode(),
-                    string (string v) => v))),
+                comparer: new ListOfReferenceTypesComparer<string[][], string[]>(new ValueComparer<string[]>(
+                    bool (string[] v1, string[] v2) => ListOfReferenceTypesComparer<string[], string>.Compare(((object)(v1)), ((object)(v2)), bool (string v1, string v2) => v1 == v2),
+                    int (string[] v) => ListOfReferenceTypesComparer<string[], string>.GetHashCode(((IEnumerable)(((object)(v)))), int (string v) => ((object)v).GetHashCode()),
+                    string[] (string[] v) => ((string[])(ListOfReferenceTypesComparer<string[], string>.Snapshot(((object)(v)), string (string v) => v))))),
                 keyComparer: new ValueComparer<string[][]>(
                     bool (string[][] v1, string[][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (string[][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),
@@ -7077,10 +7077,10 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
                 relationshipIndex: -1,
                 storeGenerationIndex: -1);
             stringNestedCollection.TypeMapping = CosmosTypeMapping.Default.Clone(
-                comparer: new ListOfReferenceTypesComparer<string[][], string[]>(new ListOfReferenceTypesComparer<string[], string>(new ValueComparer<string>(
-                    bool (string v1, string v2) => v1 == v2,
-                    int (string v) => ((object)v).GetHashCode(),
-                    string (string v) => v))),
+                comparer: new ListOfReferenceTypesComparer<string[][], string[]>(new ValueComparer<string[]>(
+                    bool (string[] v1, string[] v2) => ListOfReferenceTypesComparer<string[], string>.Compare(((object)(v1)), ((object)(v2)), bool (string v1, string v2) => v1 == v2),
+                    int (string[] v) => ListOfReferenceTypesComparer<string[], string>.GetHashCode(((IEnumerable)(((object)(v)))), int (string v) => ((object)v).GetHashCode()),
+                    string[] (string[] v) => ((string[])(ListOfReferenceTypesComparer<string[], string>.Snapshot(((object)(v)), string (string v) => v))))),
                 keyComparer: new ValueComparer<string[][]>(
                     bool (string[][] v1, string[][] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)(v1)), ((object)(v2))),
                     int (string[][] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)(v))),