diff --git a/src/cli/Revocalize.CLI/Revocalize.CLI.csproj b/src/cli/Revocalize.CLI/Revocalize.CLI.csproj
index c1d2dd9..b528fce 100644
--- a/src/cli/Revocalize.CLI/Revocalize.CLI.csproj
+++ b/src/cli/Revocalize.CLI/Revocalize.CLI.csproj
@@ -22,7 +22,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.CommandLine" Version="2.0.11" />
+    <PackageReference Include="System.CommandLine" Version="2.0.7" />
     <ProjectReference Include="../../libs/Revocalize/Revocalize.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libs/Revocalize/Generated/Revocalize.ConversionClient.g.cs b/src/libs/Revocalize/Generated/Revocalize.ConversionClient.g.cs
index 8d5f265..bf756a6 100644
--- a/src/libs/Revocalize/Generated/Revocalize.ConversionClient.g.cs
+++ b/src/libs/Revocalize/Generated/Revocalize.ConversionClient.g.cs
@@ -33,10 +33,17 @@ public sealed partial class ConversionClient : global::Revocalize.IConversionCli
 
         /// <inheritdoc/>
         public global::Revocalize.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Revocalize.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Revocalize.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>
diff --git a/src/libs/Revocalize/Generated/Revocalize.ModelsClient.g.cs b/src/libs/Revocalize/Generated/Revocalize.ModelsClient.g.cs
index e38bf07..3ea1736 100644
--- a/src/libs/Revocalize/Generated/Revocalize.ModelsClient.g.cs
+++ b/src/libs/Revocalize/Generated/Revocalize.ModelsClient.g.cs
@@ -33,10 +33,17 @@ public sealed partial class ModelsClient : global::Revocalize.IModelsClient, glo
 
         /// <inheritdoc/>
         public global::Revocalize.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Revocalize.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Revocalize.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>
diff --git a/src/libs/Revocalize/Generated/Revocalize.RevocalizeClient.g.cs b/src/libs/Revocalize/Generated/Revocalize.RevocalizeClient.g.cs
index 18848c0..9b3d345 100644
--- a/src/libs/Revocalize/Generated/Revocalize.RevocalizeClient.g.cs
+++ b/src/libs/Revocalize/Generated/Revocalize.RevocalizeClient.g.cs
@@ -35,10 +35,17 @@ public sealed partial class RevocalizeClient : global::Revocalize.IRevocalizeCli
 
         /// <inheritdoc/>
         public global::Revocalize.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Revocalize.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Revocalize.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>
@@ -47,7 +54,7 @@ public sealed partial class RevocalizeClient : global::Revocalize.IRevocalizeCli
         public ConversionClient Conversion => new ConversionClient(HttpClient, baseUri: null, authorizations: Authorizations, options: Options)
         {
             ReadResponseAsString = ReadResponseAsString,
-            JsonSerializerContext = JsonSerializerContext,
+            JsonSerializerContextProvider = JsonSerializerContextProvider,
         };
 
         /// <summary>
@@ -56,7 +63,7 @@ public sealed partial class RevocalizeClient : global::Revocalize.IRevocalizeCli
         public ModelsClient Models => new ModelsClient(HttpClient, baseUri: null, authorizations: Authorizations, options: Options)
         {
             ReadResponseAsString = ReadResponseAsString,
-            JsonSerializerContext = JsonSerializerContext,
+            JsonSerializerContextProvider = JsonSerializerContextProvider,
         };
 
         /// <summary>
@@ -65,7 +72,7 @@ public sealed partial class RevocalizeClient : global::Revocalize.IRevocalizeCli
         public TrainingClient Training => new TrainingClient(HttpClient, baseUri: null, authorizations: Authorizations, options: Options)
         {
             ReadResponseAsString = ReadResponseAsString,
-            JsonSerializerContext = JsonSerializerContext,
+            JsonSerializerContextProvider = JsonSerializerContextProvider,
         };
 
         /// <summary>
diff --git a/src/libs/Revocalize/Generated/Revocalize.TrainingClient.g.cs b/src/libs/Revocalize/Generated/Revocalize.TrainingClient.g.cs
index 3b1cc92..bd39f67 100644
--- a/src/libs/Revocalize/Generated/Revocalize.TrainingClient.g.cs
+++ b/src/libs/Revocalize/Generated/Revocalize.TrainingClient.g.cs
@@ -33,10 +33,17 @@ public sealed partial class TrainingClient : global::Revocalize.ITrainingClient,
 
         /// <inheritdoc/>
         public global::Revocalize.AutoSDKClientOptions Options { get; }
+
+        internal global::System.Lazy<global::System.Text.Json.Serialization.JsonSerializerContext> JsonSerializerContextProvider { get; set; } = new(() => global::Revocalize.SourceGenerationContext.Default);
+
         /// <summary>
         /// 
         /// </summary>
-        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext { get; set; } = global::Revocalize.SourceGenerationContext.Default;
+        public global::System.Text.Json.Serialization.JsonSerializerContext JsonSerializerContext
+        {
+            get => JsonSerializerContextProvider.Value;
+            set => JsonSerializerContextProvider = new(() => value);
+        }
 
 
         /// <summary>