diff --git a/src/libs/Mubert/Generated/Mubert.MubertClient.g.cs b/src/libs/Mubert/Generated/Mubert.MubertClient.g.cs
index 7cd6b5f..f53d4c1 100644
--- a/src/libs/Mubert/Generated/Mubert.MubertClient.g.cs
+++ b/src/libs/Mubert/Generated/Mubert.MubertClient.g.cs
@@ -37,10 +37,17 @@ public sealed partial class MubertClient : global::Mubert.IMubertClient, global:
 
         /// <inheritdoc/>
         public global::Mubert.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Mubert.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Mubert.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>
@@ -49,7 +56,7 @@ public sealed partial class MubertClient : global::Mubert.IMubertClient, global:
         public PublicClient Public => new PublicClient(HttpClient, baseUri: null, authorizations: Authorizations, options: Options)
         {
             ReadResponseAsString = ReadResponseAsString,
-            JsonSerializerContext = JsonSerializerContext,
+            JsonSerializerContextProvider = JsonSerializerContextProvider,
         };
 
         /// <summary>
@@ -58,7 +65,7 @@ public sealed partial class MubertClient : global::Mubert.IMubertClient, global:
         public PublicServiceClient PublicService => new PublicServiceClient(HttpClient, baseUri: null, authorizations: Authorizations, options: Options)
         {
             ReadResponseAsString = ReadResponseAsString,
-            JsonSerializerContext = JsonSerializerContext,
+            JsonSerializerContextProvider = JsonSerializerContextProvider,
         };
 
         /// <summary>
@@ -67,7 +74,7 @@ public sealed partial class MubertClient : global::Mubert.IMubertClient, global:
         public ServiceClient Service => new ServiceClient(HttpClient, baseUri: null, authorizations: Authorizations, options: Options)
         {
             ReadResponseAsString = ReadResponseAsString,
-            JsonSerializerContext = JsonSerializerContext,
+            JsonSerializerContextProvider = JsonSerializerContextProvider,
         };
 
         /// <summary>
diff --git a/src/libs/Mubert/Generated/Mubert.PublicClient.g.cs b/src/libs/Mubert/Generated/Mubert.PublicClient.g.cs
index f349730..273fea1 100644
--- a/src/libs/Mubert/Generated/Mubert.PublicClient.g.cs
+++ b/src/libs/Mubert/Generated/Mubert.PublicClient.g.cs
@@ -34,10 +34,17 @@ public sealed partial class PublicClient : global::Mubert.IPublicClient, global:
 
         /// <inheritdoc/>
         public global::Mubert.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Mubert.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Mubert.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>
diff --git a/src/libs/Mubert/Generated/Mubert.PublicServiceClient.g.cs b/src/libs/Mubert/Generated/Mubert.PublicServiceClient.g.cs
index 6c12c5e..38dfb5e 100644
--- a/src/libs/Mubert/Generated/Mubert.PublicServiceClient.g.cs
+++ b/src/libs/Mubert/Generated/Mubert.PublicServiceClient.g.cs
@@ -34,10 +34,17 @@ public sealed partial class PublicServiceClient : global::Mubert.IPublicServiceC
 
         /// <inheritdoc/>
         public global::Mubert.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Mubert.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Mubert.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>
diff --git a/src/libs/Mubert/Generated/Mubert.ServiceClient.g.cs b/src/libs/Mubert/Generated/Mubert.ServiceClient.g.cs
index 6f05c73..a53c986 100644
--- a/src/libs/Mubert/Generated/Mubert.ServiceClient.g.cs
+++ b/src/libs/Mubert/Generated/Mubert.ServiceClient.g.cs
@@ -34,10 +34,17 @@ public sealed partial class ServiceClient : global::Mubert.IServiceClient, globa
 
         /// <inheritdoc/>
         public global::Mubert.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Mubert.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Mubert.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>