diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
index 17dfbc19cb..027ba0bb22 100644
--- a/src/libs/Directory.Build.props
+++ b/src/libs/Directory.Build.props
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <PropertyGroup Label="Versioning">
-    <Version>0.11.3</Version>
+    <Version>0.11.4</Version>
     <MinVerMinimumMajorMinor>0.1</MinVerMinimumMajorMinor>
     <MinVerTagPrefix>v</MinVerTagPrefix>
     <MinVerDefaultPreReleaseIdentifiers>dev</MinVerDefaultPreReleaseIdentifiers>
diff --git a/src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs b/src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs
index 443a7e0942..176015cbc3 100644
--- a/src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs
+++ b/src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs
@@ -99,7 +99,7 @@ public static string GenerateMethod(
             }};").Inject() : " ")}
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: {GetHttpMethod(endPoint.Settings.TargetFramework, endPoint.HttpMethod)},
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + {endPoint.Path}, global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + {endPoint.Path}, global::System.UriKind.RelativeOrAbsolute));
 {(string.IsNullOrWhiteSpace(endPoint.RequestType.CSharpType) ? " " : $@" 
             var __json = {jsonSerializer.GenerateSerializeCall(endPoint.RequestType, endPoint.Settings.JsonSerializerContext)};
             httpRequest.Content = new global::System.Net.Http.StringContent(
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs
index f319040f3c..854723f752 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs
index 11149c8d7e..52acd3c2a3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs
@@ -19,7 +19,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs
index 4218b17aad..c04d6cb120 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs
index 650d1a8acf..916c72d3b3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs
index fe5e3f348f..b4e372a191 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs
@@ -37,7 +37,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs
index b41cb37963..e1a16d70b1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs
@@ -26,7 +26,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/authors?since={since}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/authors?since={since}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs
index 3568e3dbbd..252f899de0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs
@@ -45,7 +45,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs
index b57492bf55..e7c1290586 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/large_files", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/large_files", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs
index dd84e62de5..79d8a67b77 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs
@@ -27,7 +27,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs
index 52e1cc0c20..1f70453e08 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs
@@ -29,7 +29,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs
index b7705515a0..0113e6fadd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs
index 2e7d26ddd9..e59db0b7aa 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs
@@ -27,7 +27,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations?per_page={perPage}&page={page}&{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations?per_page={perPage}&page={page}&{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs
index b1ce250a96..ad1c3341c8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs
index e077cdca32..738471f424 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs
@@ -25,7 +25,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs
index d92345105d..1c966fe03b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs
@@ -30,7 +30,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/authors/{authorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/authors/{authorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs
index 2fa559d523..db7183788d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs
@@ -30,7 +30,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/lfs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/lfs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs
index 03929b56a6..c02c607499 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/user/migrations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/user/migrations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs
index 1fd83be3e5..a6d967fbd8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs
index efe1a3d9b4..243084c9c0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs
@@ -29,7 +29,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs
index a26733a7c1..5e4c203461 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs
index c750f8a63e..ccfa019195 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs
index 40b643d6b0..32bee0c588 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/NewtonsoftJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs
@@ -31,7 +31,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs
index c014d7074c..fe2d4de8aa 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsCancelImport.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs
index 5be863d500..82171b08bb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForAuthenticatedUser.g.verified.cs
@@ -19,7 +19,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs
index fa4468f02f..efbe9ce0d9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDeleteArchiveForOrg.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs
index 769d95848a..6a5337a868 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsDownloadArchiveForOrg.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs
index cdf47d709a..20672030f6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetArchiveForAuthenticatedUser.g.verified.cs
@@ -37,7 +37,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/archive", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs
index 51d2386dfb..843ffe066b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetCommitAuthors.g.verified.cs
@@ -26,7 +26,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/authors?since={since}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/authors?since={since}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs
index 58c2cd6fde..42e5a63fae 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetImportStatus.g.verified.cs
@@ -45,7 +45,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs
index 20ce6b9fc0..e3da451e76 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetLargeFiles.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/large_files", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/large_files", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs
index f50d7c775f..b33c660631 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForAuthenticatedUser.g.verified.cs
@@ -27,7 +27,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs
index 5cbb1a1a8d..9cb5993e95 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsGetStatusForOrg.g.verified.cs
@@ -29,7 +29,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}?{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs
index 4bbd946b16..e27f07ecc5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForAuthenticatedUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs
index 5bdbc57e55..3e98bff839 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListForOrg.g.verified.cs
@@ -27,7 +27,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations?per_page={perPage}&page={page}&{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations?per_page={perPage}&page={page}&{string.Join("&", exclude.Select(static x => $"exclude={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs
index 065a6d9892..43eaef1772 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForAuthenticatedUser.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs
index 2d47948047..a1ce24f05a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsListReposForOrg.g.verified.cs
@@ -25,7 +25,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/repositories?per_page={perPage}&page={page}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs
index b24cb99246..1d4d8848b4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsMapCommitAuthor.g.verified.cs
@@ -30,7 +30,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/authors/{authorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/authors/{authorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs
index b500b67dc5..09aa6bc265 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsSetLfsPreference.g.verified.cs
@@ -30,7 +30,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import/lfs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import/lfs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs
index a4f807221c..560f534f35 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForAuthenticatedUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/user/migrations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/user/migrations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs
index 775ceb6042..e6c97af1f1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartForOrg.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs
index d7e40d8754..88c49eaf01 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsStartImport.g.verified.cs
@@ -29,7 +29,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs
index 00c38f59fe..a58258efe5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForAuthenticatedUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/user/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/user/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs
index 56c5fbcac5..22426621ad 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUnlockRepoForOrg.g.verified.cs
@@ -23,7 +23,7 @@ public partial class MigrationsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/orgs/{org}/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/orgs/{org}/migrations/{migrationId}/repos/{repoName}/lock", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs
index b1374ef5b0..8d89f96126 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Filtering/SystemTextJson/_#G.MigrationsClient.MigrationsUpdateImport.g.verified.cs
@@ -31,7 +31,7 @@ public partial class MigrationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/repos/{owner}/{repo}/import", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AbuseClient.GetAbuse.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AbuseClient.GetAbuse.g.verified.cs
index bde39e5cc8..a470a0e2dd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AbuseClient.GetAbuse.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AbuseClient.GetAbuse.g.verified.cs
@@ -19,7 +19,7 @@ public partial class AbuseClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/abuse", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/abuse", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AsnClient.GetAsn.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AsnClient.GetAsn.g.verified.cs
index dca33f0b54..4becaa3cbc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AsnClient.GetAsn.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.AsnClient.GetAsn.g.verified.cs
@@ -19,7 +19,7 @@ public partial class AsnClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/AS{asn}/json", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/AS{asn}/json", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.DomainsClient.GetDomains.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.DomainsClient.GetDomains.g.verified.cs
index 78e1c407b1..20d3b04488 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.DomainsClient.GetDomains.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.DomainsClient.GetDomains.g.verified.cs
@@ -23,7 +23,7 @@ public partial class DomainsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/domains/{ip}?page={page}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/domains/{ip}?page={page}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.Batch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.Batch.g.verified.cs
index 6400f2eb2a..b49a9cdc48 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.Batch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.Batch.g.verified.cs
@@ -21,7 +21,7 @@ public partial class GeneralClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/batch", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/batch", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs
index a3c4c4ca8d..e93e2c738a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs
@@ -17,7 +17,7 @@ public partial class GeneralClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs
index f1daa5aae1..440d828527 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class GeneralClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs
index f549b6a9a0..d36565d5a5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class PrivacyDetectionClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/privacy", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/privacy", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.RangesClient.GetRanges.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.RangesClient.GetRanges.g.verified.cs
index b5eff7246d..7876d68ac0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.RangesClient.GetRanges.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.RangesClient.GetRanges.g.verified.cs
@@ -19,7 +19,7 @@ public partial class RangesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/ranges/{domain}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/ranges/{domain}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCityByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCityByIp.g.verified.cs
index 62f1c34593..12b80809ee 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCityByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCityByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/city", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/city", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCountryByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCountryByIp.g.verified.cs
index 88c9dfc7e8..22f3ac2e11 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCountryByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCountryByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/country", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/country", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCity.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCity.g.verified.cs
index 0f13a59129..ee6456fe1f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCity.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCity.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/city", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/city", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs
index 72ceb2b36b..51e658ca2a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/country", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/country", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs
index fb25f0990c..30cf7c2775 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/hostname", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/hostname", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentIp.g.verified.cs
index f7af3deefa..e09eb60935 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentIp.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/ip", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/ip", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs
index 225050c8a0..35a8fe5d31 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/loc", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/loc", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs
index a68fee2fb9..5ae499dfec 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/org", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/org", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs
index e6a9cfd74a..42e1fea473 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/postal", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/postal", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs
index cc595ea0ee..ec46e5a0b9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/region", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/region", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs
index 3bdceae07e..413261d73a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/timezone", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/timezone", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs
index a1f3f4ac62..9096885cf2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/hostname", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/hostname", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetIpByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetIpByIp.g.verified.cs
index 3429b74a74..ef6035d611 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetIpByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetIpByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/ip", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/ip", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetLocationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetLocationByIp.g.verified.cs
index d1325612e5..637d6fedb1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetLocationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetLocationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/loc", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/loc", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs
index ff87b19a50..9a23e0c906 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/org", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/org", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetPostalByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetPostalByIp.g.verified.cs
index 7654cfebfc..27703122bc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetPostalByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetPostalByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/postal", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/postal", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetRegionByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetRegionByIp.g.verified.cs
index 60bb826974..8e1c92eaa1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetRegionByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetRegionByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/region", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/region", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs
index eb80b2e365..e32819b60a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/NewtonsoftJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/timezone", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/timezone", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AbuseClient.GetAbuse.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AbuseClient.GetAbuse.g.verified.cs
index 4210951b56..c632f6adab 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AbuseClient.GetAbuse.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AbuseClient.GetAbuse.g.verified.cs
@@ -19,7 +19,7 @@ public partial class AbuseClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/abuse", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/abuse", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AsnClient.GetAsn.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AsnClient.GetAsn.g.verified.cs
index 5c406c4e9b..e85f0a8986 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AsnClient.GetAsn.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.AsnClient.GetAsn.g.verified.cs
@@ -19,7 +19,7 @@ public partial class AsnClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/AS{asn}/json", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/AS{asn}/json", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.DomainsClient.GetDomains.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.DomainsClient.GetDomains.g.verified.cs
index eb79ca5d78..f36f942312 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.DomainsClient.GetDomains.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.DomainsClient.GetDomains.g.verified.cs
@@ -23,7 +23,7 @@ public partial class DomainsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/domains/{ip}?page={page}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/domains/{ip}?page={page}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.Batch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.Batch.g.verified.cs
index 00656aa3d9..db3cc078f6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.Batch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.Batch.g.verified.cs
@@ -21,7 +21,7 @@ public partial class GeneralClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/batch", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/batch", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs
index d5a354cbb5..a2489ea4a9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetCurrentInformation.g.verified.cs
@@ -17,7 +17,7 @@ public partial class GeneralClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs
index 33c76a4104..b907cb4a2c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.GeneralClient.GetInformationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class GeneralClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs
index c6a73f4cd9..6ae236d700 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.PrivacyDetectionClient.GetPrivacyInformationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class PrivacyDetectionClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/privacy", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/privacy", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.RangesClient.GetRanges.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.RangesClient.GetRanges.g.verified.cs
index bd0757460e..2e7a510f95 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.RangesClient.GetRanges.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.RangesClient.GetRanges.g.verified.cs
@@ -19,7 +19,7 @@ public partial class RangesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/ranges/{domain}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/ranges/{domain}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCityByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCityByIp.g.verified.cs
index 0280812258..aacb631c22 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCityByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCityByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/city", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/city", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCountryByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCountryByIp.g.verified.cs
index d2bea34a6f..9b09ed3ad2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCountryByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCountryByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/country", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/country", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCity.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCity.g.verified.cs
index 17d12aa3ab..af6c192949 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCity.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCity.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/city", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/city", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs
index db5b1cac3b..c61d696696 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentCountry.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/country", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/country", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs
index ec4a27f2ef..ca757c56b3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentHostname.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/hostname", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/hostname", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentIp.g.verified.cs
index 586d80fdf9..7038011eba 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentIp.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/ip", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/ip", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs
index 8cae2607c8..d13fae8eef 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentLocation.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/loc", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/loc", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs
index 54206118a9..56638d4f08 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentOrganization.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/org", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/org", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs
index 0300b6d9be..5176c798f2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentPostal.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/postal", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/postal", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs
index 8b7795d214..a351943a7e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentRegion.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/region", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/region", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs
index 4380e74d2d..f548df4652 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetCurrentTimezone.g.verified.cs
@@ -17,7 +17,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/timezone", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/timezone", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs
index 6dd9c26d89..1274fc8795 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetHostnameByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/hostname", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/hostname", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetIpByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetIpByIp.g.verified.cs
index 15b23aaaae..5c6811dabd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetIpByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetIpByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/ip", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/ip", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetLocationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetLocationByIp.g.verified.cs
index b41182e981..cfb635925a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetLocationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetLocationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/loc", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/loc", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs
index 4982534829..f245fa7c40 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetOrganizationByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/org", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/org", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetPostalByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetPostalByIp.g.verified.cs
index 872eef2ff8..e374450f3b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetPostalByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetPostalByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/postal", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/postal", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetRegionByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetRegionByIp.g.verified.cs
index bc212c14fa..707c545fe4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetRegionByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetRegionByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/region", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/region", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs
index 831064a069..da2cc6b3e1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/IpInfo/SystemTextJson/_#G.SingleClient.GetTimezoneByIp.g.verified.cs
@@ -19,7 +19,7 @@ public partial class SingleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/{ip}/timezone", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/{ip}/timezone", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.CreateRunRunsPost.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.CreateRunRunsPost.g.verified.cs
index a125dc14b9..72f8086a36 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.CreateRunRunsPost.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.CreateRunRunsPost.g.verified.cs
@@ -21,7 +21,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/runs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/runs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs
index 1872d71a89..d63ec99b54 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/NewtonsoftJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs
@@ -23,7 +23,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.CreateRunRunsPost.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.CreateRunRunsPost.g.verified.cs
index 6cae25f909..116561094f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.CreateRunRunsPost.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.CreateRunRunsPost.g.verified.cs
@@ -21,7 +21,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/runs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/runs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs
index e1584fe122..ce46fdb155 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/LangSmith/SystemTextJson/_#G.Api.UpdateRunRunsRunIdPatch.g.verified.cs
@@ -23,7 +23,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Api.GetVersion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Api.GetVersion.g.verified.cs
index d5edee21ee..84d4103014 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Api.GetVersion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Api.GetVersion.g.verified.cs
@@ -17,7 +17,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/version", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/version", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs
index aba02722ee..27b7946736 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs
index 3fd048ee90..3597bda550 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs
@@ -21,7 +21,7 @@ public partial class CompletionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/generate", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/generate", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs
index f6189e33f7..4a353f409b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs
@@ -20,7 +20,7 @@ public partial class EmbeddingsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CheckBlob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CheckBlob.g.verified.cs
index 2c21fd1704..c4e2839c4d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CheckBlob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CheckBlob.g.verified.cs
@@ -19,7 +19,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Head,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CopyModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CopyModel.g.verified.cs
index 31dda5cec0..e1758576c1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CopyModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CopyModel.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/copy", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/copy", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateBlob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateBlob.g.verified.cs
index c0573f1493..04eb33b10b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateBlob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateBlob.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateModel.g.verified.cs
index 62d9cb28ed..0f493f6617 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.CreateModel.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/create", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/create", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs
index a1e2e3d123..901d82cb08 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/delete", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/delete", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs
index 59ec5b6d6a..6888a7d33c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs
@@ -16,7 +16,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/tags", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/tags", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListRunningModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListRunningModels.g.verified.cs
index 52ac1e78c6..41ab658aaf 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListRunningModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ListRunningModels.g.verified.cs
@@ -16,7 +16,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/ps", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/ps", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PullModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PullModel.g.verified.cs
index 90f7af9e88..830e7df061 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PullModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PullModel.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/pull", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/pull", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PushModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PushModel.g.verified.cs
index 0a85e84e60..9f8adbc187 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PushModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.PushModel.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/push", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/push", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs
index 0454d9da37..a6b609332e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/show", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/show", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Api.GetVersion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Api.GetVersion.g.verified.cs
index 5487d92122..6b8c5ed6fa 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Api.GetVersion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Api.GetVersion.g.verified.cs
@@ -17,7 +17,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/version", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/version", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs
index e556e2aed4..f0c81eaf63 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ChatClient.GenerateChatCompletion.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs
index e8cb3b7c28..6907baaef9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.CompletionsClient.GenerateCompletion.g.verified.cs
@@ -21,7 +21,7 @@ public partial class CompletionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/generate", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/generate", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs
index f860075ad9..74921c1595 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.EmbeddingsClient.GenerateEmbedding.g.verified.cs
@@ -20,7 +20,7 @@ public partial class EmbeddingsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CheckBlob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CheckBlob.g.verified.cs
index 2c21fd1704..c4e2839c4d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CheckBlob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CheckBlob.g.verified.cs
@@ -19,7 +19,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Head,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CopyModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CopyModel.g.verified.cs
index 301a248e76..9823ffae3a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CopyModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CopyModel.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/copy", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/copy", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateBlob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateBlob.g.verified.cs
index 6abd0f67e6..1db01cc90f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateBlob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateBlob.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/blobs/{digest}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateModel.g.verified.cs
index 8855b1de2b..8500311e49 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.CreateModel.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/create", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/create", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs
index a6db5a97ac..1643bf5183 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/delete", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/delete", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs
index 49035cc7d6..d4bef6734a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs
@@ -16,7 +16,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/tags", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/tags", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListRunningModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListRunningModels.g.verified.cs
index 9dc99eb354..cd6775aca8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListRunningModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ListRunningModels.g.verified.cs
@@ -16,7 +16,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/ps", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/ps", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PullModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PullModel.g.verified.cs
index c75f0cfff7..e37553cb2d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PullModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PullModel.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/pull", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/pull", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PushModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PushModel.g.verified.cs
index 49bbb78ab1..d159bb2ff7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PushModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.PushModel.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/push", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/push", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs
index 0176e290a6..2e401d730d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.ModelsClient.ShowModelInfo.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/show", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/show", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CancelRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CancelRun.g.verified.cs
index 1898ddb231..80898553ca 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CancelRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CancelRun.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs
index 55a57158f6..cd325bca41 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/assistants", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/assistants", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateMessage.g.verified.cs
index a79f245846..b8853f2320 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateMessage.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateRun.g.verified.cs
index 2279a7e183..cb6d14dc46 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateRun.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThread.g.verified.cs
index 2a4467a635..ca9dd86522 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThread.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/threads", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/threads", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs
index 420a0be75a..7a19c04b97 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/threads/runs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/threads/runs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs
index d04c98a1bf..821d8a98d7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs
index 6ac1c30262..1763c0d99f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteThread.g.verified.cs
index 92476ceb30..870aa84675 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.DeleteThread.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetAssistant.g.verified.cs
index 9393300aa6..a8a773e84f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetAssistant.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetMessage.g.verified.cs
index baa66e951c..375a85c3eb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetMessage.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRun.g.verified.cs
index defc12cecb..fbc34d672b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRun.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRunStep.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRunStep.g.verified.cs
index 708e2a1428..372310ab2c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRunStep.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetRunStep.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/steps/{stepId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/steps/{stepId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetThread.g.verified.cs
index 1832335dc1..d774ebf804 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.GetThread.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListAssistants.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListAssistants.g.verified.cs
index 1e55068948..871b3599e9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListAssistants.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListAssistants.g.verified.cs
@@ -30,7 +30,7 @@ public partial class AssistantsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListMessages.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListMessages.g.verified.cs
index 7b703bcf9f..eb8ca87315 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListMessages.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListMessages.g.verified.cs
@@ -34,7 +34,7 @@ public partial class AssistantsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages?limit={limit}&order={orderValue}&after={after}&before={before}&run_id={runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages?limit={limit}&order={orderValue}&after={after}&before={before}&run_id={runId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs
index 196ade6308..7daf9eda42 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs
@@ -34,7 +34,7 @@ public partial class AssistantsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/steps?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/steps?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRuns.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRuns.g.verified.cs
index 164e349814..694da1ac44 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRuns.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ListRuns.g.verified.cs
@@ -32,7 +32,7 @@ public partial class AssistantsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs
index 31227ccfc7..6204a26352 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs
index ccaea76b33..665c604c3d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyRun.g.verified.cs
index f9fad0f0cd..4221f8261e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyRun.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyThread.g.verified.cs
index cb8443e31b..0aa2bad90f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.ModifyThread.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs
index 929ffaccac..a0f0306f69 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/submit_tool_outputs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/submit_tool_outputs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateSpeech.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateSpeech.g.verified.cs
index 9a47c2a01b..aff465c44b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateSpeech.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateSpeech.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AudioClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/audio/speech", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/audio/speech", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranscription.g.verified.cs
index 53b5b7ef2f..063518359b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranscription.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AudioClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/audio/transcriptions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/audio/transcriptions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranslation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranslation.g.verified.cs
index 5035fa73e7..e9a3ed4417 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranslation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.AudioClient.CreateTranslation.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AudioClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/audio/translations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/audio/translations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CancelBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CancelBatch.g.verified.cs
index 537b2873cd..1a4cf8ec0a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CancelBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CancelBatch.g.verified.cs
@@ -18,7 +18,7 @@ public partial class BatchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CreateBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CreateBatch.g.verified.cs
index 3b47997696..1d4b8ba1f8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CreateBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.CreateBatch.g.verified.cs
@@ -20,7 +20,7 @@ public partial class BatchClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/batches", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/batches", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.ListBatches.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.ListBatches.g.verified.cs
index 8bd5c5733c..2bff71be64 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.ListBatches.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.ListBatches.g.verified.cs
@@ -20,7 +20,7 @@ public partial class BatchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/batches?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/batches?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.RetrieveBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.RetrieveBatch.g.verified.cs
index 301f173bcb..3c246638c2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.RetrieveBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.BatchClient.RetrieveBatch.g.verified.cs
@@ -18,7 +18,7 @@ public partial class BatchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs
index 716fee6010..8438b5b875 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/completions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/completions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs
index 59ae82b39c..f4aa26ef5b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs
@@ -20,7 +20,7 @@ public partial class CompletionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/completions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/completions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs
index db97f3fdd3..cff78d4e7e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs
@@ -20,7 +20,7 @@ public partial class EmbeddingsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.CreateFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.CreateFile.g.verified.cs
index d7494cba42..0fb21402f4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.CreateFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.CreateFile.g.verified.cs
@@ -24,7 +24,7 @@ public partial class FilesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/files", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/files", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DeleteFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DeleteFile.g.verified.cs
index cffc9365de..00b5160184 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DeleteFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DeleteFile.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DownloadFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DownloadFile.g.verified.cs
index d7d53b37f0..b2edac7cdd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DownloadFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.DownloadFile.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files/{fileId}/content", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files/{fileId}/content", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.ListFiles.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.ListFiles.g.verified.cs
index 36c1c244a6..4a963eccae 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.ListFiles.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.ListFiles.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files?purpose={purpose}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files?purpose={purpose}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.RetrieveFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.RetrieveFile.g.verified.cs
index 26f8e99796..efe026c56b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.RetrieveFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FilesClient.RetrieveFile.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs
index c481e0f3a0..6963e8a13b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs
index fa0dbe8580..df46f9cd1c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs
@@ -22,7 +22,7 @@ public partial class FineTuningClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/fine_tuning/jobs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/fine_tuning/jobs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs
index 649c4209e1..c73989887f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs
@@ -22,7 +22,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}/events?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}/events?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs
index a9fb396dbf..55cf89fa8a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs
@@ -22,7 +22,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}/checkpoints?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}/checkpoints?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs
index 8043fab57d..04dae1fcbd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs
@@ -20,7 +20,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs
index 35a1a959f2..09c9040ddb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs
@@ -19,7 +19,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImage.g.verified.cs
index 6ec2fb3339..78bb469817 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImage.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ImagesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/images/generations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/images/generations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs
index 090bbb4ef5..35b453df12 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ImagesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/images/edits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/images/edits", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs
index 384b96e7f1..487781485a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ImagesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/images/variations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/images/variations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs
index 15ab4a72cb..fdff3464ec 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.DeleteModel.g.verified.cs
@@ -18,7 +18,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs
index ad816b3da0..35d9b443c4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.ListModels.g.verified.cs
@@ -16,7 +16,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/models", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/models", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.RetrieveModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.RetrieveModel.g.verified.cs
index 3ef3990a62..d6e1dcc4a7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.RetrieveModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModelsClient.RetrieveModel.g.verified.cs
@@ -18,7 +18,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModerationsClient.CreateModeration.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModerationsClient.CreateModeration.g.verified.cs
index 93885b63a1..51f063a257 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModerationsClient.CreateModeration.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.ModerationsClient.CreateModeration.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModerationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/moderations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/moderations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs
index 27c6801186..41186a70b6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs
index eaf6f86410..fbb3501e78 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/vector_stores", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/vector_stores", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs
index fb18190f46..1a6c2f1372 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs
index faa50f8b46..da0726f289 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs
index 862593b6f9..707d033073 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs
@@ -18,7 +18,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs
index 2dbeb5197d..0ba9ca10a7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs
index 85723028bb..adda603c77 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs
@@ -18,7 +18,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs
index 2a71bb6e7b..7dc27c2534 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs
index 58a94af161..87caf52b49 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs
index 385312e050..93bdb97007 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs
@@ -44,7 +44,7 @@ public partial class VectorStoresClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/files?limit={limit}&order={orderValue}&after={after}&before={before}&filter={filterValue}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/files?limit={limit}&order={orderValue}&after={after}&before={before}&filter={filterValue}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs
index d1eb557487..09992ebba6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs
@@ -42,7 +42,7 @@ public partial class VectorStoresClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files?limit={limit}&order={orderValue}&after={after}&before={before}&filter={filterValue}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files?limit={limit}&order={orderValue}&after={after}&before={before}&filter={filterValue}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs
index 5eb0baf79a..bfdd8109c4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs
@@ -30,7 +30,7 @@ public partial class VectorStoresClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores?limit={limit}&order={orderValue}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs
index 194736cafd..a5119a0db6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CancelRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CancelRun.g.verified.cs
index 3494a1c069..b4a34088bb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CancelRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CancelRun.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs
index 967df6a186..cae4535ae6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateAssistant.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/assistants", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/assistants", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateMessage.g.verified.cs
index 2a0dfb5d1a..5730a664ba 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateMessage.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateRun.g.verified.cs
index f0168ef40f..349b8c1498 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateRun.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThread.g.verified.cs
index f919a25bbc..e4368fd067 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThread.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/threads", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/threads", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs
index d1b58784bc..225ef5a850 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.CreateThreadAndRun.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/threads/runs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/threads/runs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs
index 60d22c6635..99f50f078a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteAssistant.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs
index df4e2eb5c0..6c5fd07122 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteMessage.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteThread.g.verified.cs
index b26c2fad09..eb17a49a3b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.DeleteThread.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetAssistant.g.verified.cs
index 4bdf5817b3..9040e14503 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetAssistant.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetMessage.g.verified.cs
index c3fc19277d..b5eabc6533 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetMessage.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRun.g.verified.cs
index abe57e639a..60167019e0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRun.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRunStep.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRunStep.g.verified.cs
index 29f60bc19b..b17dacbad5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRunStep.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetRunStep.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/steps/{stepId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/steps/{stepId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetThread.g.verified.cs
index 5350177724..cf902c3c42 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.GetThread.g.verified.cs
@@ -18,7 +18,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListAssistants.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListAssistants.g.verified.cs
index 3d97b26820..2e2753f505 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListAssistants.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListAssistants.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListMessages.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListMessages.g.verified.cs
index 1c675806a6..4280b20940 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListMessages.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListMessages.g.verified.cs
@@ -28,7 +28,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages?limit={limit}&order={order}&after={after}&before={before}&run_id={runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages?limit={limit}&order={order}&after={after}&before={before}&run_id={runId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs
index f9cb48fb95..876762a23b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRunSteps.g.verified.cs
@@ -28,7 +28,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/steps?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/steps?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRuns.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRuns.g.verified.cs
index 1bb1c13d86..0e5963410d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRuns.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ListRuns.g.verified.cs
@@ -26,7 +26,7 @@ public partial class AssistantsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs
index 4d9e6af32e..41c252f03d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyAssistant.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/assistants/{assistantId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs
index 8e1681dde2..e92cf57ea4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyMessage.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/messages/{messageId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyRun.g.verified.cs
index f2583c5b16..b50927f1f3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyRun.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyThread.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyThread.g.verified.cs
index 50116b972b..0ca737096b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyThread.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.ModifyThread.g.verified.cs
@@ -22,7 +22,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs
index 8cbde61185..2098028810 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AssistantsClient.SubmitToolOuputsToRun.g.verified.cs
@@ -24,7 +24,7 @@ public partial class AssistantsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/threads/{threadId}/runs/{runId}/submit_tool_outputs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/threads/{threadId}/runs/{runId}/submit_tool_outputs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateSpeech.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateSpeech.g.verified.cs
index 6e2eba8dd6..d3ea652fa2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateSpeech.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateSpeech.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AudioClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/audio/speech", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/audio/speech", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranscription.g.verified.cs
index 9910d4a50f..528fbf8701 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranscription.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AudioClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/audio/transcriptions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/audio/transcriptions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranslation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranslation.g.verified.cs
index d6eb959a0a..1a3146736b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranslation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.AudioClient.CreateTranslation.g.verified.cs
@@ -20,7 +20,7 @@ public partial class AudioClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/audio/translations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/audio/translations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CancelBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CancelBatch.g.verified.cs
index 30997b3603..b9dca278bb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CancelBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CancelBatch.g.verified.cs
@@ -18,7 +18,7 @@ public partial class BatchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CreateBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CreateBatch.g.verified.cs
index 36720f392d..a2301426e7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CreateBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.CreateBatch.g.verified.cs
@@ -20,7 +20,7 @@ public partial class BatchClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/batches", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/batches", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.ListBatches.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.ListBatches.g.verified.cs
index bb59430598..9ef059121e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.ListBatches.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.ListBatches.g.verified.cs
@@ -20,7 +20,7 @@ public partial class BatchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/batches?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/batches?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.RetrieveBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.RetrieveBatch.g.verified.cs
index 73cfbd6156..611f0096c6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.RetrieveBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.BatchClient.RetrieveBatch.g.verified.cs
@@ -18,7 +18,7 @@ public partial class BatchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs
index 358c6b970d..709858c66a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ChatClient.CreateChatCompletion.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/completions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/completions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs
index 76bdfed70d..dbd37b608b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.CompletionsClient.CreateCompletion.g.verified.cs
@@ -20,7 +20,7 @@ public partial class CompletionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/completions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/completions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs
index 4e07183c3c..661bf6dff5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.EmbeddingsClient.CreateEmbedding.g.verified.cs
@@ -20,7 +20,7 @@ public partial class EmbeddingsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/embeddings", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.CreateFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.CreateFile.g.verified.cs
index f07ef07fb4..453284081e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.CreateFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.CreateFile.g.verified.cs
@@ -24,7 +24,7 @@ public partial class FilesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/files", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/files", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DeleteFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DeleteFile.g.verified.cs
index 7adc73f360..ab49292a00 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DeleteFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DeleteFile.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DownloadFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DownloadFile.g.verified.cs
index 1883bf4eb8..5c3af614ea 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DownloadFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.DownloadFile.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files/{fileId}/content", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files/{fileId}/content", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.ListFiles.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.ListFiles.g.verified.cs
index 93c1b67054..e6559a1d45 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.ListFiles.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.ListFiles.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files?purpose={purpose}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files?purpose={purpose}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.RetrieveFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.RetrieveFile.g.verified.cs
index c5c616afb8..8d77050a29 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.RetrieveFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FilesClient.RetrieveFile.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FilesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs
index 0f23352efb..70dabfa9e7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CancelFineTuningJob.g.verified.cs
@@ -18,7 +18,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs
index 977e10b3b8..324e811f24 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.CreateFineTuningJob.g.verified.cs
@@ -22,7 +22,7 @@ public partial class FineTuningClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/fine_tuning/jobs", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/fine_tuning/jobs", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs
index 7ebb70d1f9..0b56bd2445 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningEvents.g.verified.cs
@@ -22,7 +22,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}/events?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}/events?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs
index 36f8d29ee2..99c0937a14 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListFineTuningJobCheckpoints.g.verified.cs
@@ -22,7 +22,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}/checkpoints?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}/checkpoints?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs
index 016ccfa967..6c2c623121 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.ListPaginatedFineTuningJobs.g.verified.cs
@@ -20,7 +20,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs?after={after}&limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs
index e07875edc7..4acbc29d89 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.FineTuningClient.RetrieveFineTuningJob.g.verified.cs
@@ -19,7 +19,7 @@ public partial class FineTuningClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/fine_tuning/jobs/{fineTuningJobId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/fine_tuning/jobs/{fineTuningJobId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImage.g.verified.cs
index 51db6d3192..b63f198a64 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImage.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ImagesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/images/generations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/images/generations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs
index fc9e58158c..9fcfb93c58 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageEdit.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ImagesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/images/edits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/images/edits", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs
index c9ae1bb6ce..712953499b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ImagesClient.CreateImageVariation.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ImagesClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/images/variations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/images/variations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs
index b42c8204d4..862d169622 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.DeleteModel.g.verified.cs
@@ -18,7 +18,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs
index e867777478..9c256bdacd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.ListModels.g.verified.cs
@@ -16,7 +16,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/models", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/models", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.RetrieveModel.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.RetrieveModel.g.verified.cs
index b1c314ca04..283888d1b8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.RetrieveModel.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModelsClient.RetrieveModel.g.verified.cs
@@ -18,7 +18,7 @@ public partial class ModelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{model}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModerationsClient.CreateModeration.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModerationsClient.CreateModeration.g.verified.cs
index 132237cb33..b8e0797d44 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModerationsClient.CreateModeration.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.ModerationsClient.CreateModeration.g.verified.cs
@@ -20,7 +20,7 @@ public partial class ModerationsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/moderations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/moderations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs
index 7b02e1b863..add6d383c8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CancelVectorStoreFileBatch.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs
index f0f9578d92..c46da0c575 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStore.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/vector_stores", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/vector_stores", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs
index 47b9e7ee62..82847dc1bb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFile.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs
index dde79a0ed9..7ac9d63027 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.CreateVectorStoreFileBatch.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs
index 266db514dd..3081684170 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStore.g.verified.cs
@@ -18,7 +18,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs
index eb1b76ef2d..a4f328d941 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.DeleteVectorStoreFile.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs
index f668a4cf52..e8cb13e278 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStore.g.verified.cs
@@ -18,7 +18,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs
index 52ac8fd5c7..ea95a1e26b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFile.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files/{fileId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs
index 61fbdcae33..98963a2fab 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.GetVectorStoreFileBatch.g.verified.cs
@@ -20,7 +20,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs
index 2373502391..621e6b4625 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListFilesInVectorStoreBatch.g.verified.cs
@@ -30,7 +30,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/files?limit={limit}&order={order}&after={after}&before={before}&filter={filter}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/file_batches/{batchId}/files?limit={limit}&order={order}&after={after}&before={before}&filter={filter}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs
index 76fee9f2bd..8a3380d3b6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStoreFiles.g.verified.cs
@@ -28,7 +28,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}/files?limit={limit}&order={order}&after={after}&before={before}&filter={filter}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}/files?limit={limit}&order={order}&after={after}&before={before}&filter={filter}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs
index ef206af233..4f98e0a7aa 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ListVectorStores.g.verified.cs
@@ -24,7 +24,7 @@ public partial class VectorStoresClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores?limit={limit}&order={order}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs
index 1ddd0ad983..7976ad31f7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.VectorStoresClient.ModifyVectorStore.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VectorStoresClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/vector_stores/{vectorStoreId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/NewtonsoftJson/_#G.Api.GetPets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/NewtonsoftJson/_#G.Api.GetPets.g.verified.cs
index ddccaaa6be..22495a0e2f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/NewtonsoftJson/_#G.Api.GetPets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/NewtonsoftJson/_#G.Api.GetPets.g.verified.cs
@@ -16,7 +16,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/pets", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/pets", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/SystemTextJson/_#G.Api.GetPets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/SystemTextJson/_#G.Api.GetPets.g.verified.cs
index ddccaaa6be..22495a0e2f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/SystemTextJson/_#G.Api.GetPets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenApi3_0_Yaml/SystemTextJson/_#G.Api.GetPets.g.verified.cs
@@ -16,7 +16,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/pets", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/pets", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelPredictions.g.verified.cs
index a3c5ccf0ee..bc17766d48 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelPredictions.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/predictions/{predictionId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/predictions/{predictionId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelTrainings.g.verified.cs
index 94ff1573dc..5883a118bc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CancelTrainings.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/trainings/{trainingId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/trainings/{trainingId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateDeployments.g.verified.cs
index b9d3dfbf2e..6767b3b449 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateDeployments.g.verified.cs
@@ -61,7 +61,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/deployments", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/deployments", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateModels.g.verified.cs
index 040495e10a..997da4627a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateModels.g.verified.cs
@@ -46,7 +46,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/models", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/models", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictions.g.verified.cs
index 2176a5695a..937ca9c0b8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictions.g.verified.cs
@@ -60,7 +60,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs
index 95affb33f0..dd6c617fc1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs
@@ -63,7 +63,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsModels.g.verified.cs
index ee210c339c..aebbca6cae 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreatePredictionsModels.g.verified.cs
@@ -63,7 +63,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateTrainings.g.verified.cs
index 794fc47632..73addf3589 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.CreateTrainings.g.verified.cs
@@ -67,7 +67,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions/{versionId}/trainings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions/{versionId}/trainings", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteDeployments.g.verified.cs
index b0e3cff683..42a80ad7fe 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteDeployments.g.verified.cs
@@ -30,7 +30,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteModels.g.verified.cs
index 91eb399796..18bbf9e90f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteModels.g.verified.cs
@@ -32,7 +32,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteVersionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteVersionsModels.g.verified.cs
index 5f0e3838dc..32aad88c9d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteVersionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.DeleteVersionsModels.g.verified.cs
@@ -37,7 +37,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetAccount.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetAccount.g.verified.cs
index 958fe871ed..14a19c5e99 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetAccount.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetAccount.g.verified.cs
@@ -32,7 +32,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/account", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/account", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetCollections.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetCollections.g.verified.cs
index 27c150a231..39537504d8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetCollections.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetCollections.g.verified.cs
@@ -33,7 +33,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/collections/{collectionSlug}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/collections/{collectionSlug}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetDeployments.g.verified.cs
index 29c62ec973..135e54fd9e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetDeployments.g.verified.cs
@@ -51,7 +51,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetModels.g.verified.cs
index d47572a037..dee3249d0c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetModels.g.verified.cs
@@ -50,7 +50,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetPredictions.g.verified.cs
index 429e2df29f..25800c900c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetPredictions.g.verified.cs
@@ -61,7 +61,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/predictions/{predictionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/predictions/{predictionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs
index 9a739e7148..133670e1e4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs
@@ -29,7 +29,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/webhooks/default/secret", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/webhooks/default/secret", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetTrainings.g.verified.cs
index f2e32f547a..40d1013ae1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetTrainings.g.verified.cs
@@ -62,7 +62,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/trainings/{trainingId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/trainings/{trainingId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetVersionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetVersionsModels.g.verified.cs
index 097f9cbd68..033678f47c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetVersionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.GetVersionsModels.g.verified.cs
@@ -64,7 +64,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListCollections.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListCollections.g.verified.cs
index 7872e5c32f..53190621e6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListCollections.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListCollections.g.verified.cs
@@ -36,7 +36,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/collections", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/collections", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListDeployments.g.verified.cs
index 7525277f88..8ca0d40299 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListDeployments.g.verified.cs
@@ -53,7 +53,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/deployments", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/deployments", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListHardware.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListHardware.g.verified.cs
index 7c2f00bbfa..03e65ec874 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListHardware.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListHardware.g.verified.cs
@@ -31,7 +31,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/hardware", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/hardware", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListModels.g.verified.cs
index 43dd349812..66b4dc5fa5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListModels.g.verified.cs
@@ -51,7 +51,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/models", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/models", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListPredictions.g.verified.cs
index 5654ca675f..c6163992dc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListPredictions.g.verified.cs
@@ -60,7 +60,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListTrainings.g.verified.cs
index 05c721adb5..a63fa2ac8b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListTrainings.g.verified.cs
@@ -62,7 +62,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/trainings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/trainings", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListVersionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListVersionsModels.g.verified.cs
index e181120d82..860644ba2f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListVersionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.ListVersionsModels.g.verified.cs
@@ -41,7 +41,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.UpdateDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.UpdateDeployments.g.verified.cs
index 095abc39bb..675ca397b0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.UpdateDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/NewtonsoftJson/_#G.Api.UpdateDeployments.g.verified.cs
@@ -59,7 +59,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelPredictions.g.verified.cs
index a3c5ccf0ee..bc17766d48 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelPredictions.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/predictions/{predictionId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/predictions/{predictionId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelTrainings.g.verified.cs
index 94ff1573dc..5883a118bc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CancelTrainings.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/trainings/{trainingId}/cancel", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/trainings/{trainingId}/cancel", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateDeployments.g.verified.cs
index 15366a095c..b575346e0b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateDeployments.g.verified.cs
@@ -61,7 +61,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/deployments", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/deployments", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateModels.g.verified.cs
index 978ea3394a..04fdb8bb5e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateModels.g.verified.cs
@@ -46,7 +46,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/models", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/models", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictions.g.verified.cs
index 74188c3411..14705c39c8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictions.g.verified.cs
@@ -60,7 +60,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs
index c4f9338e68..593e45090b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsDeployments.g.verified.cs
@@ -63,7 +63,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsModels.g.verified.cs
index 88a8442913..b1bc0749ee 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreatePredictionsModels.g.verified.cs
@@ -63,7 +63,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateTrainings.g.verified.cs
index 63e6b402bf..90f04b3b60 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.CreateTrainings.g.verified.cs
@@ -67,7 +67,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions/{versionId}/trainings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions/{versionId}/trainings", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteDeployments.g.verified.cs
index b0e3cff683..42a80ad7fe 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteDeployments.g.verified.cs
@@ -30,7 +30,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteModels.g.verified.cs
index 91eb399796..18bbf9e90f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteModels.g.verified.cs
@@ -32,7 +32,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteVersionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteVersionsModels.g.verified.cs
index 5f0e3838dc..32aad88c9d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteVersionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.DeleteVersionsModels.g.verified.cs
@@ -37,7 +37,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetAccount.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetAccount.g.verified.cs
index 94db50148f..ceb4cb28c7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetAccount.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetAccount.g.verified.cs
@@ -32,7 +32,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/account", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/account", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetCollections.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetCollections.g.verified.cs
index 27c150a231..39537504d8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetCollections.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetCollections.g.verified.cs
@@ -33,7 +33,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/collections/{collectionSlug}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/collections/{collectionSlug}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetDeployments.g.verified.cs
index 18fe1210e0..bbea8bb0d4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetDeployments.g.verified.cs
@@ -51,7 +51,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetModels.g.verified.cs
index d47572a037..dee3249d0c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetModels.g.verified.cs
@@ -50,7 +50,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetPredictions.g.verified.cs
index 429e2df29f..25800c900c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetPredictions.g.verified.cs
@@ -61,7 +61,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/predictions/{predictionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/predictions/{predictionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs
index ee749434ed..ed1e2f2718 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetSecretDefaultWebhooks.g.verified.cs
@@ -29,7 +29,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/webhooks/default/secret", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/webhooks/default/secret", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetTrainings.g.verified.cs
index f2e32f547a..40d1013ae1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetTrainings.g.verified.cs
@@ -62,7 +62,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/trainings/{trainingId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/trainings/{trainingId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetVersionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetVersionsModels.g.verified.cs
index 097f9cbd68..033678f47c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetVersionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.GetVersionsModels.g.verified.cs
@@ -64,7 +64,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions/{versionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListCollections.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListCollections.g.verified.cs
index 7872e5c32f..53190621e6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListCollections.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListCollections.g.verified.cs
@@ -36,7 +36,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/collections", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/collections", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListDeployments.g.verified.cs
index 6e4f022566..25b6db725c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListDeployments.g.verified.cs
@@ -53,7 +53,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/deployments", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/deployments", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListHardware.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListHardware.g.verified.cs
index 9c78b816d8..e4b38f8b1d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListHardware.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListHardware.g.verified.cs
@@ -31,7 +31,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/hardware", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/hardware", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListModels.g.verified.cs
index 43dd349812..66b4dc5fa5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListModels.g.verified.cs
@@ -51,7 +51,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/models", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/models", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListPredictions.g.verified.cs
index 5654ca675f..c6163992dc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListPredictions.g.verified.cs
@@ -60,7 +60,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListTrainings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListTrainings.g.verified.cs
index 05c721adb5..a63fa2ac8b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListTrainings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListTrainings.g.verified.cs
@@ -62,7 +62,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/trainings", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/trainings", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListVersionsModels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListVersionsModels.g.verified.cs
index e181120d82..860644ba2f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListVersionsModels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.ListVersionsModels.g.verified.cs
@@ -41,7 +41,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/models/{modelOwner}/{modelName}/versions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/models/{modelOwner}/{modelName}/versions", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.UpdateDeployments.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.UpdateDeployments.g.verified.cs
index 5c2d65a2ab..deaa616eef 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.UpdateDeployments.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Replicate/SystemTextJson/_#G.Api.UpdateDeployments.g.verified.cs
@@ -59,7 +59,7 @@ public partial class Api
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/deployments/{deploymentOwner}/{deploymentName}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.CreatePets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.CreatePets.g.verified.cs
index 22c9a21214..e4def132ca 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.CreatePets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.CreatePets.g.verified.cs
@@ -16,7 +16,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/pets", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/pets", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ListPets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ListPets.g.verified.cs
index 8aea88d06e..e77527fd8e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ListPets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ListPets.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/pets?limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/pets?limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ShowPetById.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ShowPetById.g.verified.cs
index 655df961fd..286e2a9dd5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ShowPetById.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/NewtonsoftJson/_#G.Api.ShowPetById.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/pets/{petId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/pets/{petId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.CreatePets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.CreatePets.g.verified.cs
index bedd7136ec..7223b44a09 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.CreatePets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.CreatePets.g.verified.cs
@@ -16,7 +16,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/pets", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/pets", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ListPets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ListPets.g.verified.cs
index 8c6bc0e873..da88dddb2f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ListPets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ListPets.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/pets?limit={limit}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/pets?limit={limit}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ShowPetById.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ShowPetById.g.verified.cs
index 7947a10b9f..bb7b4ca347 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ShowPetById.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/SpecialCases/SystemTextJson/_#G.Api.ShowPetById.g.verified.cs
@@ -18,7 +18,7 @@ public partial class Api
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/pets/{petId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/pets/{petId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.GetAdSchedule.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.GetAdSchedule.g.verified.cs
index e7c8084eb9..e0bc15113a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.GetAdSchedule.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.GetAdSchedule.g.verified.cs
@@ -21,7 +21,7 @@ public partial class AdsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/ads?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/ads?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs
index 83432881a7..4b0a5c41a5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs
@@ -21,7 +21,7 @@ public partial class AdsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/ads/schedule/snooze?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/ads/schedule/snooze?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.StartCommercial.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.StartCommercial.g.verified.cs
index f455bcbb8b..5c53ff5f31 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.StartCommercial.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AdsClient.StartCommercial.g.verified.cs
@@ -25,7 +25,7 @@ public partial class AdsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/channels/commercial", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/channels/commercial", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs
index 0c0a49a809..214248b4b0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs
@@ -36,7 +36,7 @@ public partial class AnalyticsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/analytics/extensions?extension_id={extensionId}&type={typeValue}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/analytics/extensions?extension_id={extensionId}&type={typeValue}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs
index f260511897..03a71fce7a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs
@@ -36,7 +36,7 @@ public partial class AnalyticsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/analytics/games?game_id={gameId}&type={typeValue}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/analytics/games?game_id={gameId}&type={typeValue}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs
index 85fb55e02b..c82ebb2283 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs
@@ -36,7 +36,7 @@ public partial class BitsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/bits/leaderboard?count={count}&period={periodValue}&started_at={startedAt}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/bits/leaderboard?count={count}&period={periodValue}&started_at={startedAt}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetCheermotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetCheermotes.g.verified.cs
index d2ee888197..c138551f14 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetCheermotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetCheermotes.g.verified.cs
@@ -21,7 +21,7 @@ public partial class BitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/bits/cheermotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/bits/cheermotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs
index 829706d9e5..fb7af88218 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs
@@ -28,7 +28,7 @@ public partial class BitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/transactions?extension_id={extensionId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/transactions?extension_id={extensionId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs
index 0f40c3e678..17c6c77e24 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs
@@ -21,7 +21,7 @@ public partial class CCLsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/content_classification_labels?locale={locale}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/content_classification_labels?locale={locale}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs
index 81b6a56263..558941d334 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ChannelPointsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs
index aeb3c84822..ed7f5ddcdf 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ChannelPointsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs
index 5e516e5db3..3b991c8d48 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChannelPointsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&only_manageable_rewards={onlyManageableRewards}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&only_manageable_rewards={onlyManageableRewards}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs
index a70c188d7f..c03692c15c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs
@@ -47,7 +47,7 @@ public partial class ChannelPointsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards/redemptions?broadcaster_id={broadcasterId}&reward_id={rewardId}&status={statusValue}&{string.Join("&", id.Select(static x => $"id={x}"))}&sort={sortValue}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards/redemptions?broadcaster_id={broadcasterId}&reward_id={rewardId}&status={statusValue}&{string.Join("&", id.Select(static x => $"id={x}"))}&sort={sortValue}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs
index d23a12cda1..884f423ad0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ChannelPointsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs
index d6d84a6efe..c7b56163a3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ChannelPointsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards/redemptions?{string.Join("&", id.Select(static x => $"id={x}"))}&broadcaster_id={broadcasterId}&reward_id={rewardId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards/redemptions?{string.Join("&", id.Select(static x => $"id={x}"))}&broadcaster_id={broadcasterId}&reward_id={rewardId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs
index 7eea575fbe..1ebbeb79de 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/editors?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/editors?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs
index ae554a3df7..ac5579a454 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/followers?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/followers?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs
index a2592c1a1b..aa10081196 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels?{string.Join("&", broadcasterId.Select(static x => $"broadcasterId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels?{string.Join("&", broadcasterId.Select(static x => $"broadcasterId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs
index 1b88844202..2575c9e469 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/followed?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/followed?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs
index 64b94d1c6b..f2db505df9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChannelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs
index c5e2ffde11..9d272ba123 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs
@@ -22,7 +22,7 @@ public partial class CharityClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/charity/campaigns?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/charity/campaigns?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs
index d077334213..232b843360 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs
@@ -26,7 +26,7 @@ public partial class CharityClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/charity/donations?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/charity/donations?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs
index cd3f1977b2..bea12edeca 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/badges?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/badges?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs
index ffd3e268c2..cd21bb9318 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/emotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/emotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatSettings.g.verified.cs
index 1435e473e1..03db11e307 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatSettings.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatters.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatters.g.verified.cs
index 57871973c3..28607f013b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatters.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetChatters.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/chatters?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/chatters?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetEmoteSets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetEmoteSets.g.verified.cs
index c7406d41ff..37b3644554 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetEmoteSets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetEmoteSets.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/emotes/set?{string.Join("&", emoteSetId.Select(static x => $"emoteSetId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/emotes/set?{string.Join("&", emoteSetId.Select(static x => $"emoteSetId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs
index 0e961686e6..62ef8e1720 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/badges/global", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/badges/global", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs
index 8cb185e334..36236eaf1c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/emotes/global", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/emotes/global", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserChatColor.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserChatColor.g.verified.cs
index 772ccf977c..831815eeca 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserChatColor.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserChatColor.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/color?{string.Join("&", userId.Select(static x => $"userId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/color?{string.Join("&", userId.Select(static x => $"userId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserEmotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserEmotes.g.verified.cs
index 443868159c..319e40d906 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserEmotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.GetUserEmotes.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/emotes/user?user_id={userId}&broadcaster_id={broadcasterId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/emotes/user?user_id={userId}&broadcaster_id={broadcasterId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendAShoutout.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendAShoutout.g.verified.cs
index bb9cf4d4ab..eb6dcde391 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendAShoutout.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendAShoutout.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/shoutouts?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/shoutouts?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs
index 19512bb6c8..a0a64b4582 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/announcements?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/announcements?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatMessage.g.verified.cs
index 71e5c3ec97..0e371147e1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.SendChatMessage.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/messages", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/messages", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs
index 9d94a10e22..8f04fbb7a4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs
@@ -32,7 +32,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs
index 08214c465c..0f3f1acb51 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs
@@ -42,7 +42,7 @@ public partial class ChatClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/color?user_id={userId}&color={colorValue}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/color?user_id={userId}&color={colorValue}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.CreateClip.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.CreateClip.g.verified.cs
index 83aa4986df..89d267be5c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.CreateClip.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.CreateClip.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ClipsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/clips?broadcaster_id={broadcasterId}&has_delay={hasDelay}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/clips?broadcaster_id={broadcasterId}&has_delay={hasDelay}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.GetClips.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.GetClips.g.verified.cs
index 4045074c69..1aafee628f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.GetClips.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ClipsClient.GetClips.g.verified.cs
@@ -40,7 +40,7 @@ public partial class ClipsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/clips?broadcaster_id={broadcasterId}&game_id={gameId}&{string.Join("&", id.Select(static x => $"id={x}"))}&started_at={startedAt}&ended_at={endedAt}&first={first}&before={before}&after={after}&is_featured={isFeatured}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/clips?broadcaster_id={broadcasterId}&game_id={gameId}&{string.Join("&", id.Select(static x => $"id={x}"))}&started_at={startedAt}&ended_at={endedAt}&first={first}&before={before}&after={after}&is_featured={isFeatured}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.CreateConduits.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.CreateConduits.g.verified.cs
index 5a19f10001..b82180389b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.CreateConduits.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.CreateConduits.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ConduitsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs
index 33a60e9e27..43e1e0bbe8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ConduitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/conduits?id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/conduits?id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs
index 7cea8c4d9e..f9d0385df8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ConduitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/conduits/shards?conduit_id={conduitId}&status={status}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/conduits/shards?conduit_id={conduitId}&status={status}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduits.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduits.g.verified.cs
index 11b5c61e0f..ca1b951f94 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduits.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.GetConduits.g.verified.cs
@@ -19,7 +19,7 @@ public partial class ConduitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs
index 56b072b49c..ab2450d4a6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ConduitsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits/shards", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits/shards", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs
index 5ea8a9b84e..2e5ded0149 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ConduitsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs
index dbae705134..f62580e4d1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs
@@ -50,7 +50,7 @@ public partial class EntitlementsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/entitlements/drops?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&fulfillment_status={fulfillmentStatusValue}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/entitlements/drops?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&fulfillment_status={fulfillmentStatusValue}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs
index 2f68d531c2..aebb106574 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs
@@ -28,7 +28,7 @@ public partial class EntitlementsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/entitlements/drops", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/entitlements/drops", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs
index 5e2a2f8f7e..c171196d15 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs
@@ -25,7 +25,7 @@ public partial class EventSubClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/subscriptions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/subscriptions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs
index 2a99f20c7e..30ceb9462e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs
@@ -22,7 +22,7 @@ public partial class EventSubClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/subscriptions?id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/subscriptions?id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs
index 5a846a91c9..cd908ea582 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs
@@ -124,7 +124,7 @@ public partial class EventSubClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/subscriptions?status={statusValue}&type={typeValue}&user_id={userId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/subscriptions?status={statusValue}&type={typeValue}&user_id={userId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs
index 74482b5d20..7f042bcc9f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/jwt/secrets?extension_id={extensionId}&delay={delay}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/jwt/secrets?extension_id={extensionId}&delay={delay}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs
index ec7cb5b9ba..1fffdbc248 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/bits/extensions?should_include_all={shouldIncludeAll}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/bits/extensions?should_include_all={shouldIncludeAll}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs
index 8f1c34b7df..325a3ef13f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs
@@ -33,7 +33,7 @@ public partial class ExtensionsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/configurations?broadcaster_id={broadcasterId}&extension_id={extensionId}&segment={segmentValue}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/configurations?broadcaster_id={broadcasterId}&extension_id={extensionId}&segment={segmentValue}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs
index 998193e3ab..15371be994 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/live?extension_id={extensionId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/live?extension_id={extensionId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs
index 1a04fece07..de591f2fed 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs
@@ -19,7 +19,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/extensions/jwt/secrets", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/extensions/jwt/secrets", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs
index b80966ed97..b7decb07b9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs
index 9e42dcdda9..a59f4d586f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/released?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/released?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs
index ece9230f7f..53d03dcec8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/chat?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/chat?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs
index 379451c21c..b1591e0d46 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs
@@ -52,7 +52,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/extensions/pubsub", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/extensions/pubsub", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs
index bf19d6286f..e2f3981e6c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/extensions/configurations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/extensions/configurations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs
index 95e5595746..6dc72255fe 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/required_configuration?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/required_configuration?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs
index ece6addda3..6a05931bf0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/bits/extensions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/bits/extensions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetGames.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetGames.g.verified.cs
index 4d9b0a7c78..564f55b0da 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetGames.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetGames.g.verified.cs
@@ -27,7 +27,7 @@ public partial class GamesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/games?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", name.Select(static x => $"name={x}"))}&{string.Join("&", igdbId.Select(static x => $"igdbId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/games?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", name.Select(static x => $"name={x}"))}&{string.Join("&", igdbId.Select(static x => $"igdbId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetTopGames.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetTopGames.g.verified.cs
index 6fa54edf40..678bc32d56 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetTopGames.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GamesClient.GetTopGames.g.verified.cs
@@ -25,7 +25,7 @@ public partial class GamesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/games/top?first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/games/top?first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs
index 37e01397c8..4f80e58bf1 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs
@@ -22,7 +22,7 @@ public partial class GoalsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/goals?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/goals?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs
index 2f68f6d5b4..647a777fac 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs
@@ -30,7 +30,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs
index 77e8984448..3aa2e44955 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs
@@ -22,7 +22,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/session?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/session?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs
index d1fc517b7c..ab89366f3d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs
@@ -28,7 +28,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs
index d5cd2b8e8c..04d73bdf9f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs
@@ -32,7 +32,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}&should_reinvite_guest={shouldReinviteGuest}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}&should_reinvite_guest={shouldReinviteGuest}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs
index e7137778c4..cf6d188b16 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs
@@ -24,7 +24,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/session?broadcaster_id={broadcasterId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/session?broadcaster_id={broadcasterId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs
index d0e0196080..5d1fc78910 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs
@@ -24,7 +24,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs
index 5b999c24c3..edbd120d09 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs
@@ -26,7 +26,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs
index d55aa91cd0..467e7887cd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs
@@ -24,7 +24,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/session?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/session?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs
index 82ca5fa96c..7edb41bf53 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs
@@ -28,7 +28,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs
index cf10cd004f..b754d21a5e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs
@@ -26,7 +26,7 @@ public partial class GuestStarClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs
index 6c8daa3e4a..d22bfe8fc0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs
@@ -30,7 +30,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&source_slot_id={sourceSlotId}&destination_slot_id={destinationSlotId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&source_slot_id={sourceSlotId}&destination_slot_id={destinationSlotId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs
index 34450d99b3..1aaabfdb79 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs
@@ -36,7 +36,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&slot_id={slotId}&is_audio_enabled={isAudioEnabled}&is_video_enabled={isVideoEnabled}&is_live={isLive}&volume={volume}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&slot_id={slotId}&is_audio_enabled={isAudioEnabled}&is_video_enabled={isVideoEnabled}&is_live={isLive}&volume={volume}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs
index f51da537d4..48620acdb4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs
@@ -26,7 +26,7 @@ public partial class HypeTrainClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/hypetrain/events?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/hypetrain/events?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs
index fce2ca9c60..9242853f16 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs
index f72edab44e..4b12fa0432 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelVip.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelVip.g.verified.cs
index ddf2f78e1e..37a8c5c805 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelVip.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.AddChannelVip.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.BanUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.BanUser.g.verified.cs
index 0f62c1a087..70b2f72720 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.BanUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.BanUser.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs
index c29cb51e0f..11992b480f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs
@@ -33,7 +33,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/enforcements/status?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/enforcements/status?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs
index bf4da1feff..256cabcc7b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/chat?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&message_id={messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/chat?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&message_id={messageId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs
index fd18b1e274..b6cea2e97b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs
index 7336c91c99..d7d55ffd14 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/banned?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/banned?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs
index ce71e90fb4..efcca83965 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs
index 3e1c522d4b..1fe5402c67 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/channels?user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/channels?user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModerators.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModerators.g.verified.cs
index 421bc7683c..cb6327f14a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModerators.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetModerators.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/moderators?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/moderators?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs
index ff2c0a6874..c6ac498ab8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs
index 1c925c6633..e1a7753322 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs
@@ -32,7 +32,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&status={status}&user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&status={status}&user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetVips.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetVips.g.verified.cs
index 2b5479bdb2..c0796bcc16 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetVips.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.GetVips.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/vips?{string.Join("&", userId.Select(static x => $"userId={x}"))}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/vips?{string.Join("&", userId.Select(static x => $"userId={x}"))}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs
index 720613488b..22ba576897 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/moderation/automod/message", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/moderation/automod/message", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs
index 46616b8e12..5e8fccc06e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs
index 98b88b950b..cc457e8465 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs
index 84d97a5d4e..56bf8000af 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs
index 5ab37748e7..e9008a0a8b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&unban_request_id={unbanRequestId}&status={status}&resolution_text={resolutionText}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&unban_request_id={unbanRequestId}&status={status}&resolution_text={resolutionText}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UnbanUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UnbanUser.g.verified.cs
index 3ac4e4f5a1..5eb612b197 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UnbanUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UnbanUser.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs
index 4622af3e89..848a050ea0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs
@@ -34,7 +34,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs
index 2ef9016690..8827c277a3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.CreatePoll.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.CreatePoll.g.verified.cs
index 059c8c17db..d4ff24730f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.CreatePoll.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.CreatePoll.g.verified.cs
@@ -24,7 +24,7 @@ public partial class PollsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/polls", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/polls", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.EndPoll.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.EndPoll.g.verified.cs
index 01ce8907d7..014c11fdd9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.EndPoll.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.EndPoll.g.verified.cs
@@ -23,7 +23,7 @@ public partial class PollsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/polls", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/polls", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.GetPolls.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.GetPolls.g.verified.cs
index 4198b43e00..c56cab3d2b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.GetPolls.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PollsClient.GetPolls.g.verified.cs
@@ -29,7 +29,7 @@ public partial class PollsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/polls?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/polls?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs
index 6b836957a2..62a68ed7f5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs
@@ -24,7 +24,7 @@ public partial class PredictionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.EndPrediction.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.EndPrediction.g.verified.cs
index 81510e81d2..cb19e19d3a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.EndPrediction.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.EndPrediction.g.verified.cs
@@ -23,7 +23,7 @@ public partial class PredictionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.GetPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.GetPredictions.g.verified.cs
index 0d3b8ce3bf..da68e44c26 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.GetPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.PredictionsClient.GetPredictions.g.verified.cs
@@ -28,7 +28,7 @@ public partial class PredictionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/predictions?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/predictions?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.CancelARaid.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.CancelARaid.g.verified.cs
index 8417a9eed1..b28af5c556 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.CancelARaid.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.CancelARaid.g.verified.cs
@@ -23,7 +23,7 @@ public partial class RaidsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/raids?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/raids?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.StartARaid.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.StartARaid.g.verified.cs
index d9872b22f9..537cf0c11b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.StartARaid.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.RaidsClient.StartARaid.g.verified.cs
@@ -27,7 +27,7 @@ public partial class RaidsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/raids?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/raids?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs
index f038af0680..987a52b37e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ScheduleClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/segment?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/segment?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs
index a8452dfe2b..3aaac77e57 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs
index 68cfe777db..0143d87113 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/icalendar?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/icalendar?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs
index e136cfcd1c..66f886a961 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs
@@ -32,7 +32,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&start_time={startTime}&utc_offset={utcOffset}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&start_time={startTime}&utc_offset={utcOffset}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs
index 8c173e3a7e..8a735089b0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/settings?broadcaster_id={broadcasterId}&is_vacation_enabled={isVacationEnabled}&vacation_start_time={vacationStartTime}&vacation_end_time={vacationEndTime}&timezone={timezone}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/settings?broadcaster_id={broadcasterId}&is_vacation_enabled={isVacationEnabled}&vacation_start_time={vacationStartTime}&vacation_end_time={vacationEndTime}&timezone={timezone}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs
index fe544c235e..beaba817e0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ScheduleClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchCategories.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchCategories.g.verified.cs
index 55cc3e1292..6b38bb319d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchCategories.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchCategories.g.verified.cs
@@ -26,7 +26,7 @@ public partial class SearchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/search/categories?query={query}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/search/categories?query={query}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchChannels.g.verified.cs
index 158a453ec6..d57e7c9842 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SearchClient.SearchChannels.g.verified.cs
@@ -30,7 +30,7 @@ public partial class SearchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/search/channels?query={query}&live_only={liveOnly}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/search/channels?query={query}&live_only={liveOnly}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs
index 2fbb9750b0..565fbed7b9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs
@@ -28,7 +28,7 @@ public partial class StreamsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/streams/markers", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/streams/markers", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs
index 307b896688..9ff80d7942 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs
@@ -25,7 +25,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/followed?user_id={userId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/followed?user_id={userId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamKey.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamKey.g.verified.cs
index 853b901e59..c8f9edbeb2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamKey.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamKey.g.verified.cs
@@ -21,7 +21,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/key?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/key?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs
index 6281d15d42..73474b66aa 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs
@@ -29,7 +29,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/markers?user_id={userId}&video_id={videoId}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/markers?user_id={userId}&video_id={videoId}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreams.g.verified.cs
index 390e8935fd..fab7b7b523 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.StreamsClient.GetStreams.g.verified.cs
@@ -42,7 +42,7 @@ public partial class StreamsClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams?{string.Join("&", userId.Select(static x => $"userId={x}"))}&{string.Join("&", userLogin.Select(static x => $"userLogin={x}"))}&{string.Join("&", gameId.Select(static x => $"gameId={x}"))}&type={typeValue}&{string.Join("&", language.Select(static x => $"language={x}"))}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams?{string.Join("&", userId.Select(static x => $"userId={x}"))}&{string.Join("&", userLogin.Select(static x => $"userLogin={x}"))}&{string.Join("&", gameId.Select(static x => $"gameId={x}"))}&type={typeValue}&{string.Join("&", language.Select(static x => $"language={x}"))}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs
index edea7d0510..86ab61a42d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs
@@ -24,7 +24,7 @@ public partial class SubscriptionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/subscriptions/user?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/subscriptions/user?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs
index 25e907979a..8fc0e759be 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs
@@ -31,7 +31,7 @@ public partial class SubscriptionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/subscriptions?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/subscriptions?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs
index fb1b958514..e5b10b0003 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs
@@ -28,7 +28,7 @@ public partial class TagsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/tags/streams?{string.Join("&", tagId.Select(static x => $"tagId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/tags/streams?{string.Join("&", tagId.Select(static x => $"tagId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetStreamTags.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetStreamTags.g.verified.cs
index a868a39bd4..cacf673d51 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetStreamTags.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TagsClient.GetStreamTags.g.verified.cs
@@ -23,7 +23,7 @@ public partial class TagsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/tags?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/tags?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs
index 8f93b420f3..30c6341241 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs
@@ -21,7 +21,7 @@ public partial class TeamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/teams/channel?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/teams/channel?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetTeams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetTeams.g.verified.cs
index d2e74db9ee..11b32d8bcd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetTeams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.TeamsClient.GetTeams.g.verified.cs
@@ -23,7 +23,7 @@ public partial class TeamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/teams?name={name}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/teams?name={name}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.BlockUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.BlockUser.g.verified.cs
index c526e3424a..19981c634d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.BlockUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.BlockUser.g.verified.cs
@@ -39,7 +39,7 @@ public partial class UsersClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/blocks?target_user_id={targetUserId}&source_context={sourceContextValue}&reason={reasonValue}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/blocks?target_user_id={targetUserId}&source_context={sourceContextValue}&reason={reasonValue}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs
index c3101cb2a2..617e955844 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs
@@ -22,7 +22,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/extensions?user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/extensions?user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserBlockList.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserBlockList.g.verified.cs
index 391ff58283..bea26a221c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserBlockList.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserBlockList.g.verified.cs
@@ -25,7 +25,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/blocks?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/blocks?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserExtensions.g.verified.cs
index 761b30e376..3ac3f921fd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUserExtensions.g.verified.cs
@@ -19,7 +19,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/users/extensions/list", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/users/extensions/list", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUsers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUsers.g.verified.cs
index 0284b819b1..2e53434d05 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUsers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.GetUsers.g.verified.cs
@@ -30,7 +30,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", login.Select(static x => $"login={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", login.Select(static x => $"login={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UnblockUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UnblockUser.g.verified.cs
index 4f32ae937e..31c49fbf38 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UnblockUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UnblockUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/blocks?target_user_id={targetUserId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/blocks?target_user_id={targetUserId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUser.g.verified.cs
index caec5a42fc..e3fb3e4a43 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUser.g.verified.cs
@@ -22,7 +22,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users?description={description}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users?description={description}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs
index bc32efd911..ead587ea4f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs
@@ -24,7 +24,7 @@ public partial class UsersClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/users/extensions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/users/extensions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.DeleteVideos.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.DeleteVideos.g.verified.cs
index 8b1ffc79a1..644903d538 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.DeleteVideos.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.DeleteVideos.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VideosClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.GetVideos.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.GetVideos.g.verified.cs
index 0c99c051e8..b7f3a323f0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.GetVideos.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.VideosClient.GetVideos.g.verified.cs
@@ -64,7 +64,7 @@ public partial class VideosClient
             };
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&language={language}&period={periodValue}&sort={sortValue}&type={typeValue}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&language={language}&period={periodValue}&sort={sortValue}&type={typeValue}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.WhispersClient.SendWhisper.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.WhispersClient.SendWhisper.g.verified.cs
index 59d3e1a6f7..70bbc07bfc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.WhispersClient.SendWhisper.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/NewtonsoftJson/_#G.WhispersClient.SendWhisper.g.verified.cs
@@ -30,7 +30,7 @@ public partial class WhispersClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/whispers?from_user_id={fromUserId}&to_user_id={toUserId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/whispers?from_user_id={fromUserId}&to_user_id={toUserId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.GetAdSchedule.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.GetAdSchedule.g.verified.cs
index 412a190483..c8a67f8c62 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.GetAdSchedule.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.GetAdSchedule.g.verified.cs
@@ -21,7 +21,7 @@ public partial class AdsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/ads?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/ads?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs
index 6c09899b76..23a0912b5b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.SnoozeNextAd.g.verified.cs
@@ -21,7 +21,7 @@ public partial class AdsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/ads/schedule/snooze?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/ads/schedule/snooze?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.StartCommercial.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.StartCommercial.g.verified.cs
index 66246bc857..a5646f6565 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.StartCommercial.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AdsClient.StartCommercial.g.verified.cs
@@ -25,7 +25,7 @@ public partial class AdsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/channels/commercial", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/channels/commercial", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs
index d573bcdf3c..5197d3df79 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetExtensionAnalytics.g.verified.cs
@@ -31,7 +31,7 @@ public partial class AnalyticsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/analytics/extensions?extension_id={extensionId}&type={type}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/analytics/extensions?extension_id={extensionId}&type={type}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs
index 9d7c1f183e..727ec1b7a5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.AnalyticsClient.GetGameAnalytics.g.verified.cs
@@ -31,7 +31,7 @@ public partial class AnalyticsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/analytics/games?game_id={gameId}&type={type}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/analytics/games?game_id={gameId}&type={type}&started_at={startedAt}&ended_at={endedAt}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs
index b3490da6dd..f695f6ad11 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetBitsLeaderboard.g.verified.cs
@@ -27,7 +27,7 @@ public partial class BitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/bits/leaderboard?count={count}&period={period}&started_at={startedAt}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/bits/leaderboard?count={count}&period={period}&started_at={startedAt}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetCheermotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetCheermotes.g.verified.cs
index 5618c0192f..6326cd5227 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetCheermotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetCheermotes.g.verified.cs
@@ -21,7 +21,7 @@ public partial class BitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/bits/cheermotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/bits/cheermotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs
index ace3932e3d..8e343b5da9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.BitsClient.GetExtensionTransactions.g.verified.cs
@@ -28,7 +28,7 @@ public partial class BitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/transactions?extension_id={extensionId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/transactions?extension_id={extensionId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs
index 8e69ec69bf..df8f82e028 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CCLsClient.GetContentClassificationLabels.g.verified.cs
@@ -21,7 +21,7 @@ public partial class CCLsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/content_classification_labels?locale={locale}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/content_classification_labels?locale={locale}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs
index bafe42d68f..44dec52e45 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.CreateCustomRewards.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ChannelPointsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs
index aeb3c84822..ed7f5ddcdf 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.DeleteCustomReward.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ChannelPointsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs
index 0ddfa7ce76..9a30a75a90 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomReward.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChannelPointsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&only_manageable_rewards={onlyManageableRewards}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&only_manageable_rewards={onlyManageableRewards}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs
index e2e9c02255..6c95a2beb9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.GetCustomRewardRedemption.g.verified.cs
@@ -34,7 +34,7 @@ public partial class ChannelPointsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards/redemptions?broadcaster_id={broadcasterId}&reward_id={rewardId}&status={status}&{string.Join("&", id.Select(static x => $"id={x}"))}&sort={sort}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards/redemptions?broadcaster_id={broadcasterId}&reward_id={rewardId}&status={status}&{string.Join("&", id.Select(static x => $"id={x}"))}&sort={sort}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs
index 328d8e8f05..a9397a3694 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateCustomReward.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ChannelPointsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs
index 1d7b3ceab8..31fe96d88f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelPointsClient.UpdateRedemptionStatus.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ChannelPointsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channel_points/custom_rewards/redemptions?{string.Join("&", id.Select(static x => $"id={x}"))}&broadcaster_id={broadcasterId}&reward_id={rewardId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channel_points/custom_rewards/redemptions?{string.Join("&", id.Select(static x => $"id={x}"))}&broadcaster_id={broadcasterId}&reward_id={rewardId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs
index af1b78d021..e1c11e3cc4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelEditors.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/editors?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/editors?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs
index a5ba17a8b3..d1ca63ed80 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelFollowers.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/followers?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/followers?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs
index 86147f7f31..1dbc06261b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetChannelInformation.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels?{string.Join("&", broadcasterId.Select(static x => $"broadcasterId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels?{string.Join("&", broadcasterId.Select(static x => $"broadcasterId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs
index 4730b3d3d3..bec35b6f8c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.GetFollowedChannels.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChannelsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/followed?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/followed?user_id={userId}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs
index dff8f23645..73a878ae0f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChannelsClient.ModifyChannelInformation.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChannelsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs
index bd22829fba..92a8b8b6ec 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaign.g.verified.cs
@@ -22,7 +22,7 @@ public partial class CharityClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/charity/campaigns?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/charity/campaigns?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs
index 2fa46f07a9..3e71fa84f4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.CharityClient.GetCharityCampaignDonations.g.verified.cs
@@ -26,7 +26,7 @@ public partial class CharityClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/charity/donations?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/charity/donations?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs
index e89cfdfe7e..9ee4d31a47 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelChatBadges.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/badges?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/badges?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs
index 7d6ea32dce..ff593309e7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChannelEmotes.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/emotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/emotes?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatSettings.g.verified.cs
index 362051ae16..105e703400 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatSettings.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatters.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatters.g.verified.cs
index daad4c590b..36d567cc44 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatters.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetChatters.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/chatters?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/chatters?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetEmoteSets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetEmoteSets.g.verified.cs
index df71c73839..9eedc9f0cd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetEmoteSets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetEmoteSets.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/emotes/set?{string.Join("&", emoteSetId.Select(static x => $"emoteSetId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/emotes/set?{string.Join("&", emoteSetId.Select(static x => $"emoteSetId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs
index 7654044f8c..f0523c748c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalChatBadges.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/badges/global", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/badges/global", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs
index 2f07c486b0..95c3914b5a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetGlobalEmotes.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/emotes/global", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/emotes/global", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserChatColor.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserChatColor.g.verified.cs
index 651fd1cdbb..ac4b800bd6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserChatColor.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserChatColor.g.verified.cs
@@ -22,7 +22,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/color?{string.Join("&", userId.Select(static x => $"userId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/color?{string.Join("&", userId.Select(static x => $"userId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserEmotes.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserEmotes.g.verified.cs
index 1625927d03..eab15ee1e7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserEmotes.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.GetUserEmotes.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/emotes/user?user_id={userId}&broadcaster_id={broadcasterId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/emotes/user?user_id={userId}&broadcaster_id={broadcasterId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendAShoutout.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendAShoutout.g.verified.cs
index bb9cf4d4ab..eb6dcde391 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendAShoutout.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendAShoutout.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/shoutouts?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/shoutouts?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs
index 0b77f753d6..b624e32b6d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatAnnouncement.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/announcements?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/announcements?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatMessage.g.verified.cs
index e1c3de916d..126f2c80f9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.SendChatMessage.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/chat/messages", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/chat/messages", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs
index e2fda254bb..f4ce1de636 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateChatSettings.g.verified.cs
@@ -32,7 +32,7 @@ public partial class ChatClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs
index 783ad9a43c..b27d795ec7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ChatClient.UpdateUserChatColor.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ChatClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/chat/color?user_id={userId}&color={color}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/chat/color?user_id={userId}&color={color}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.CreateClip.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.CreateClip.g.verified.cs
index 3132806fbe..e83d94d6cd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.CreateClip.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.CreateClip.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ClipsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/clips?broadcaster_id={broadcasterId}&has_delay={hasDelay}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/clips?broadcaster_id={broadcasterId}&has_delay={hasDelay}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.GetClips.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.GetClips.g.verified.cs
index 6742777ea5..cb2dd95601 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.GetClips.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ClipsClient.GetClips.g.verified.cs
@@ -40,7 +40,7 @@ public partial class ClipsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/clips?broadcaster_id={broadcasterId}&game_id={gameId}&{string.Join("&", id.Select(static x => $"id={x}"))}&started_at={startedAt}&ended_at={endedAt}&first={first}&before={before}&after={after}&is_featured={isFeatured}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/clips?broadcaster_id={broadcasterId}&game_id={gameId}&{string.Join("&", id.Select(static x => $"id={x}"))}&started_at={startedAt}&ended_at={endedAt}&first={first}&before={before}&after={after}&is_featured={isFeatured}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.CreateConduits.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.CreateConduits.g.verified.cs
index 339fca40af..64cb150e8b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.CreateConduits.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.CreateConduits.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ConduitsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs
index 33a60e9e27..43e1e0bbe8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.DeleteConduit.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ConduitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/conduits?id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/conduits?id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs
index 0fc535fbaf..58702c2dbc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduitShards.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ConduitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/conduits/shards?conduit_id={conduitId}&status={status}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/conduits/shards?conduit_id={conduitId}&status={status}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduits.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduits.g.verified.cs
index 6a68eaf402..d476940828 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduits.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.GetConduits.g.verified.cs
@@ -19,7 +19,7 @@ public partial class ConduitsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs
index 6fcfc6fb0d..8af687d04c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduitShards.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ConduitsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits/shards", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits/shards", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs
index 7185b26c60..cee2878b9b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ConduitsClient.UpdateConduits.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ConduitsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/conduits", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs
index 394e1cd16c..9a7ad793cc 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.GetDropsEntitlements.g.verified.cs
@@ -44,7 +44,7 @@ public partial class EntitlementsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/entitlements/drops?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&fulfillment_status={fulfillmentStatus}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/entitlements/drops?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&fulfillment_status={fulfillmentStatus}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs
index ad4a9bb5b3..4c3fee78cd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EntitlementsClient.UpdateDropsEntitlements.g.verified.cs
@@ -28,7 +28,7 @@ public partial class EntitlementsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/entitlements/drops", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/entitlements/drops", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs
index ef822bb70a..d2adc3172c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.CreateEventsubSubscription.g.verified.cs
@@ -25,7 +25,7 @@ public partial class EventSubClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/eventsub/subscriptions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/eventsub/subscriptions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs
index 2a99f20c7e..30ceb9462e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.DeleteEventsubSubscription.g.verified.cs
@@ -22,7 +22,7 @@ public partial class EventSubClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/subscriptions?id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/subscriptions?id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs
index 928fd94d45..7a44cc1a50 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.EventSubClient.GetEventsubSubscriptions.g.verified.cs
@@ -30,7 +30,7 @@ public partial class EventSubClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/eventsub/subscriptions?status={status}&type={type}&user_id={userId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/eventsub/subscriptions?status={status}&type={type}&user_id={userId}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs
index e05586fe7b..ea27770f1f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.CreateExtensionSecret.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/jwt/secrets?extension_id={extensionId}&delay={delay}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/jwt/secrets?extension_id={extensionId}&delay={delay}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs
index 3e1902d417..9fcd240dd7 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionBitsProducts.g.verified.cs
@@ -21,7 +21,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/bits/extensions?should_include_all={shouldIncludeAll}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/bits/extensions?should_include_all={shouldIncludeAll}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs
index 427e278614..b85daf0e3f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionConfigurationSegment.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/configurations?broadcaster_id={broadcasterId}&extension_id={extensionId}&segment={segment}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/configurations?broadcaster_id={broadcasterId}&extension_id={extensionId}&segment={segment}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs
index ec45f097be..9fbd6389e5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionLiveChannels.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/live?extension_id={extensionId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/live?extension_id={extensionId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs
index d28432bd9d..eccb516e86 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensionSecrets.g.verified.cs
@@ -19,7 +19,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/extensions/jwt/secrets", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/extensions/jwt/secrets", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs
index 00a4635336..ac794137ca 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetExtensions.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs
index 5ded6ef470..6142f192ca 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.GetReleasedExtensions.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/released?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/released?extension_id={extensionId}&extension_version={extensionVersion}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs
index 93ac86b830..3e8451fd5b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionChatMessage.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/chat?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/chat?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs
index 0e0c10d78c..5f0c8542e4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SendExtensionPubsubMessage.g.verified.cs
@@ -52,7 +52,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/extensions/pubsub", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/extensions/pubsub", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs
index 384cc56916..0a05661c86 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionConfigurationSegment.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/extensions/configurations", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/extensions/configurations", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs
index f702d22b1f..c70ea3a2d9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.SetExtensionRequiredConfiguration.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/extensions/required_configuration?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/extensions/required_configuration?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs
index 1486c0cbaf..4a460fe82e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ExtensionsClient.UpdateExtensionBitsProduct.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ExtensionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/bits/extensions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/bits/extensions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetGames.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetGames.g.verified.cs
index d374e6ae28..90a954a887 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetGames.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetGames.g.verified.cs
@@ -27,7 +27,7 @@ public partial class GamesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/games?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", name.Select(static x => $"name={x}"))}&{string.Join("&", igdbId.Select(static x => $"igdbId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/games?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", name.Select(static x => $"name={x}"))}&{string.Join("&", igdbId.Select(static x => $"igdbId={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetTopGames.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetTopGames.g.verified.cs
index 58e8a7800b..fa70e77e02 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetTopGames.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GamesClient.GetTopGames.g.verified.cs
@@ -25,7 +25,7 @@ public partial class GamesClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/games/top?first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/games/top?first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs
index fcdeb0d7ac..19515c9e62 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GoalsClient.GetCreatorGoals.g.verified.cs
@@ -22,7 +22,7 @@ public partial class GoalsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/goals?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/goals?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs
index 2f68f6d5b4..647a777fac 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.AssignGuestStarSlot.g.verified.cs
@@ -30,7 +30,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs
index efaae43ed3..2668a5818a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.CreateGuestStarSession.g.verified.cs
@@ -22,7 +22,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/session?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/session?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs
index d1fc517b7c..ab89366f3d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarInvite.g.verified.cs
@@ -28,7 +28,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs
index d5cd2b8e8c..04d73bdf9f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.DeleteGuestStarSlot.g.verified.cs
@@ -32,7 +32,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}&should_reinvite_guest={shouldReinviteGuest}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}&slot_id={slotId}&should_reinvite_guest={shouldReinviteGuest}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs
index e7137778c4..cf6d188b16 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.EndGuestStarSession.g.verified.cs
@@ -24,7 +24,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/session?broadcaster_id={broadcasterId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/session?broadcaster_id={broadcasterId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs
index 0cb9453d68..655c561b90 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetChannelGuestStarSettings.g.verified.cs
@@ -24,7 +24,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs
index a0f0739aee..f61e6bad63 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarInvites.g.verified.cs
@@ -26,7 +26,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs
index 863e047ea8..7a8c4a353b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.GetGuestStarSession.g.verified.cs
@@ -24,7 +24,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/session?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/session?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs
index 82ca5fa96c..7edb41bf53 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.SendGuestStarInvite.g.verified.cs
@@ -28,7 +28,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/invites?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&guest_id={guestId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs
index f2dd15b829..871e3d3a73 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateChannelGuestStarSettings.g.verified.cs
@@ -26,7 +26,7 @@ public partial class GuestStarClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/channel_settings?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs
index 6c8daa3e4a..d22bfe8fc0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlot.g.verified.cs
@@ -30,7 +30,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&source_slot_id={sourceSlotId}&destination_slot_id={destinationSlotId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&source_slot_id={sourceSlotId}&destination_slot_id={destinationSlotId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs
index 34450d99b3..1aaabfdb79 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.GuestStarClient.UpdateGuestStarSlotSettings.g.verified.cs
@@ -36,7 +36,7 @@ public partial class GuestStarClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/guest_star/slot_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&slot_id={slotId}&is_audio_enabled={isAudioEnabled}&is_video_enabled={isVideoEnabled}&is_live={isLive}&volume={volume}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/guest_star/slot_settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&session_id={sessionId}&slot_id={slotId}&is_audio_enabled={isAudioEnabled}&is_video_enabled={isVideoEnabled}&is_live={isLive}&volume={volume}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs
index 26e229665c..07c459b3e5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.HypeTrainClient.GetHypeTrainEvents.g.verified.cs
@@ -26,7 +26,7 @@ public partial class HypeTrainClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/hypetrain/events?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/hypetrain/events?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs
index c99fa25905..b8cc10c33e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddBlockedTerm.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs
index f72edab44e..4b12fa0432 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelModerator.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelVip.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelVip.g.verified.cs
index ddf2f78e1e..37a8c5c805 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelVip.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.AddChannelVip.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.BanUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.BanUser.g.verified.cs
index adf0d80488..fc9d0e5e40 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.BanUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.BanUser.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs
index 0b06b61a6c..51dab83e00 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.CheckAutomodStatus.g.verified.cs
@@ -33,7 +33,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/enforcements/status?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/enforcements/status?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs
index bf4da1feff..256cabcc7b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.DeleteChatMessages.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/chat?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&message_id={messageId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/chat?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&message_id={messageId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs
index 55ea29fb90..80505ef394 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetAutomodSettings.g.verified.cs
@@ -23,7 +23,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs
index a79440225f..18dc811f7c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBannedUsers.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/banned?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/banned?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs
index 5cf44700fe..a6ea711298 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetBlockedTerms.g.verified.cs
@@ -27,7 +27,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs
index 608b109757..c792ee2cb2 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModeratedChannels.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/channels?user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/channels?user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModerators.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModerators.g.verified.cs
index c85ebcc20a..b9b6126cc6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModerators.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetModerators.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/moderators?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/moderators?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs
index c14091826d..fe07573593 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetShieldModeStatus.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs
index 2f890e87c2..ed2f608216 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetUnbanRequests.g.verified.cs
@@ -32,7 +32,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&status={status}&user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&status={status}&user_id={userId}&after={after}&first={first}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetVips.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetVips.g.verified.cs
index 65c84694f4..1490bd5954 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetVips.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.GetVips.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/vips?{string.Join("&", userId.Select(static x => $"userId={x}"))}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/vips?{string.Join("&", userId.Select(static x => $"userId={x}"))}&broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs
index 92c3253bda..d5e5c9dc8a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ManageHeldAutomodMessages.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/moderation/automod/message", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/moderation/automod/message", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs
index 46616b8e12..5e8fccc06e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveBlockedTerm.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/blocked_terms?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs
index 98b88b950b..cc457e8465 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelModerator.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/moderators?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs
index 84d97a5d4e..56bf8000af 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.RemoveChannelVip.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/channels/vips?user_id={userId}&broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs
index c40c342685..ef68f3cb6c 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.ResolveUnbanRequests.g.verified.cs
@@ -30,7 +30,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&unban_request_id={unbanRequestId}&status={status}&resolution_text={resolutionText}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/unban_requests?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&unban_request_id={unbanRequestId}&status={status}&resolution_text={resolutionText}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UnbanUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UnbanUser.g.verified.cs
index 3ac4e4f5a1..5eb612b197 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UnbanUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UnbanUser.g.verified.cs
@@ -26,7 +26,7 @@ public partial class ModerationClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/bans?broadcaster_id={broadcasterId}&moderator_id={moderatorId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs
index 1e78612a6f..9a70622ed6 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateAutomodSettings.g.verified.cs
@@ -34,7 +34,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/automod/settings?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs
index e929b15a26..b3a4752c0a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ModerationClient.UpdateShieldModeStatus.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ModerationClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/moderation/shield_mode?broadcaster_id={broadcasterId}&moderator_id={moderatorId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.CreatePoll.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.CreatePoll.g.verified.cs
index ef18d4b793..f5388ee504 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.CreatePoll.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.CreatePoll.g.verified.cs
@@ -24,7 +24,7 @@ public partial class PollsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/polls", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/polls", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.EndPoll.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.EndPoll.g.verified.cs
index 80a2eae44e..dee58a1667 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.EndPoll.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.EndPoll.g.verified.cs
@@ -23,7 +23,7 @@ public partial class PollsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/polls", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/polls", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.GetPolls.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.GetPolls.g.verified.cs
index 0eaa4f2ee1..34016b0cda 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.GetPolls.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PollsClient.GetPolls.g.verified.cs
@@ -29,7 +29,7 @@ public partial class PollsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/polls?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/polls?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs
index cb7963d41b..f6ab65a125 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.CreatePrediction.g.verified.cs
@@ -24,7 +24,7 @@ public partial class PredictionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.EndPrediction.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.EndPrediction.g.verified.cs
index f7b8db3eb9..98fc8e6a73 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.EndPrediction.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.EndPrediction.g.verified.cs
@@ -23,7 +23,7 @@ public partial class PredictionsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/predictions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/predictions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.GetPredictions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.GetPredictions.g.verified.cs
index a7bcd22030..9f54c5b389 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.GetPredictions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.PredictionsClient.GetPredictions.g.verified.cs
@@ -28,7 +28,7 @@ public partial class PredictionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/predictions?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/predictions?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.CancelARaid.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.CancelARaid.g.verified.cs
index 8417a9eed1..b28af5c556 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.CancelARaid.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.CancelARaid.g.verified.cs
@@ -23,7 +23,7 @@ public partial class RaidsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/raids?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/raids?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.StartARaid.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.StartARaid.g.verified.cs
index 7641f08d5e..377ff475c4 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.StartARaid.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.RaidsClient.StartARaid.g.verified.cs
@@ -27,7 +27,7 @@ public partial class RaidsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/raids?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/raids?from_broadcaster_id={fromBroadcasterId}&to_broadcaster_id={toBroadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs
index 0fd76553c2..82e8dd526a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.CreateChannelStreamScheduleSegment.g.verified.cs
@@ -25,7 +25,7 @@ public partial class ScheduleClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/segment?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/segment?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs
index a8452dfe2b..3aaac77e57 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.DeleteChannelStreamScheduleSegment.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs
index 68cfe777db..0143d87113 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelIcalendar.g.verified.cs
@@ -24,7 +24,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/icalendar?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/icalendar?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs
index dee4c0444d..a482731c7e 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.GetChannelStreamSchedule.g.verified.cs
@@ -32,7 +32,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&start_time={startTime}&utc_offset={utcOffset}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule?broadcaster_id={broadcasterId}&{string.Join("&", id.Select(static x => $"id={x}"))}&start_time={startTime}&utc_offset={utcOffset}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs
index 8c173e3a7e..8a735089b0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamSchedule.g.verified.cs
@@ -29,7 +29,7 @@ public partial class ScheduleClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/settings?broadcaster_id={broadcasterId}&is_vacation_enabled={isVacationEnabled}&vacation_start_time={vacationStartTime}&vacation_end_time={vacationEndTime}&timezone={timezone}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/settings?broadcaster_id={broadcasterId}&is_vacation_enabled={isVacationEnabled}&vacation_start_time={vacationStartTime}&vacation_end_time={vacationEndTime}&timezone={timezone}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs
index 76bba8f32d..dc6814fbd8 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.ScheduleClient.UpdateChannelStreamScheduleSegment.g.verified.cs
@@ -28,7 +28,7 @@ public partial class ScheduleClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Patch,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/schedule/segment?broadcaster_id={broadcasterId}&id={id}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchCategories.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchCategories.g.verified.cs
index 04d9a8db37..5a4bb5617b 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchCategories.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchCategories.g.verified.cs
@@ -26,7 +26,7 @@ public partial class SearchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/search/categories?query={query}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/search/categories?query={query}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchChannels.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchChannels.g.verified.cs
index be79594c3d..97597d76eb 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchChannels.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SearchClient.SearchChannels.g.verified.cs
@@ -30,7 +30,7 @@ public partial class SearchClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/search/channels?query={query}&live_only={liveOnly}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/search/channels?query={query}&live_only={liveOnly}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs
index 7ebb9bfe56..3b8d6670b0 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.CreateStreamMarker.g.verified.cs
@@ -28,7 +28,7 @@ public partial class StreamsClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/streams/markers", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/streams/markers", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs
index ab85541b64..7f7a68ee50 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetFollowedStreams.g.verified.cs
@@ -25,7 +25,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/followed?user_id={userId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/followed?user_id={userId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamKey.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamKey.g.verified.cs
index 43af9087c1..a6ab9d88e9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamKey.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamKey.g.verified.cs
@@ -21,7 +21,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/key?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/key?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs
index 100c1d4441..a01d6d8db5 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreamMarkers.g.verified.cs
@@ -29,7 +29,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/markers?user_id={userId}&video_id={videoId}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/markers?user_id={userId}&video_id={videoId}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreams.g.verified.cs
index dd9f270e6e..e32bc6eff3 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.StreamsClient.GetStreams.g.verified.cs
@@ -36,7 +36,7 @@ public partial class StreamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams?{string.Join("&", userId.Select(static x => $"userId={x}"))}&{string.Join("&", userLogin.Select(static x => $"userLogin={x}"))}&{string.Join("&", gameId.Select(static x => $"gameId={x}"))}&type={type}&{string.Join("&", language.Select(static x => $"language={x}"))}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams?{string.Join("&", userId.Select(static x => $"userId={x}"))}&{string.Join("&", userLogin.Select(static x => $"userLogin={x}"))}&{string.Join("&", gameId.Select(static x => $"gameId={x}"))}&type={type}&{string.Join("&", language.Select(static x => $"language={x}"))}&first={first}&before={before}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs
index 0ccb8ed82a..d5dcb78b0f 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.CheckUserSubscription.g.verified.cs
@@ -24,7 +24,7 @@ public partial class SubscriptionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/subscriptions/user?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/subscriptions/user?broadcaster_id={broadcasterId}&user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs
index 9882ad1231..07cf56b12d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.SubscriptionsClient.GetBroadcasterSubscriptions.g.verified.cs
@@ -31,7 +31,7 @@ public partial class SubscriptionsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/subscriptions?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/subscriptions?broadcaster_id={broadcasterId}&{string.Join("&", userId.Select(static x => $"userId={x}"))}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs
index 65240a7f11..7df48b7c74 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetAllStreamTags.g.verified.cs
@@ -28,7 +28,7 @@ public partial class TagsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/tags/streams?{string.Join("&", tagId.Select(static x => $"tagId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/tags/streams?{string.Join("&", tagId.Select(static x => $"tagId={x}"))}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetStreamTags.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetStreamTags.g.verified.cs
index 86ed9c8825..42fae82e25 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetStreamTags.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TagsClient.GetStreamTags.g.verified.cs
@@ -23,7 +23,7 @@ public partial class TagsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/streams/tags?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/streams/tags?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs
index 40200e71b4..cb0e1ffc96 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetChannelTeams.g.verified.cs
@@ -21,7 +21,7 @@ public partial class TeamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/teams/channel?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/teams/channel?broadcaster_id={broadcasterId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetTeams.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetTeams.g.verified.cs
index f8212789be..731aaecaab 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetTeams.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.TeamsClient.GetTeams.g.verified.cs
@@ -23,7 +23,7 @@ public partial class TeamsClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/teams?name={name}&id={id}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/teams?name={name}&id={id}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.BlockUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.BlockUser.g.verified.cs
index 89d04a6d4b..34ecd73c1a 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.BlockUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.BlockUser.g.verified.cs
@@ -26,7 +26,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/blocks?target_user_id={targetUserId}&source_context={sourceContext}&reason={reason}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/blocks?target_user_id={targetUserId}&source_context={sourceContext}&reason={reason}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs
index 2b45250143..753b72c685 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserActiveExtensions.g.verified.cs
@@ -22,7 +22,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/extensions?user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/extensions?user_id={userId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserBlockList.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserBlockList.g.verified.cs
index 9a98663b9d..086c6c9a92 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserBlockList.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserBlockList.g.verified.cs
@@ -25,7 +25,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/blocks?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/blocks?broadcaster_id={broadcasterId}&first={first}&after={after}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserExtensions.g.verified.cs
index 6b247ac3b0..63ed5789ee 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUserExtensions.g.verified.cs
@@ -19,7 +19,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/users/extensions/list", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/users/extensions/list", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUsers.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUsers.g.verified.cs
index 6e7f54a330..a9aa2c26d9 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUsers.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.GetUsers.g.verified.cs
@@ -30,7 +30,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", login.Select(static x => $"login={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users?{string.Join("&", id.Select(static x => $"id={x}"))}&{string.Join("&", login.Select(static x => $"login={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UnblockUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UnblockUser.g.verified.cs
index 4f32ae937e..31c49fbf38 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UnblockUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UnblockUser.g.verified.cs
@@ -21,7 +21,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users/blocks?target_user_id={targetUserId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users/blocks?target_user_id={targetUserId}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUser.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUser.g.verified.cs
index c2679869e6..b17dd6c258 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUser.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUser.g.verified.cs
@@ -22,7 +22,7 @@ public partial class UsersClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/users?description={description}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/users?description={description}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs
index 4cc8fab798..d92df8f97d 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.UsersClient.UpdateUserExtensions.g.verified.cs
@@ -24,7 +24,7 @@ public partial class UsersClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Put,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + "/users/extensions", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + "/users/extensions", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.DeleteVideos.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.DeleteVideos.g.verified.cs
index 64b12308db..9baa90f4cd 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.DeleteVideos.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.DeleteVideos.g.verified.cs
@@ -22,7 +22,7 @@ public partial class VideosClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Delete,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.GetVideos.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.GetVideos.g.verified.cs
index 3f58160dbd..57639bca17 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.GetVideos.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.VideosClient.GetVideos.g.verified.cs
@@ -41,7 +41,7 @@ public partial class VideosClient
         {
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Get,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&language={language}&period={period}&sort={sort}&type={type}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/videos?{string.Join("&", id.Select(static x => $"id={x}"))}&user_id={userId}&game_id={gameId}&language={language}&period={period}&sort={sort}&type={type}&first={first}&after={after}&before={before}", global::System.UriKind.RelativeOrAbsolute));
 
             using var response = await _httpClient.SendAsync(
                 request: httpRequest,
diff --git a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.WhispersClient.SendWhisper.g.verified.cs b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.WhispersClient.SendWhisper.g.verified.cs
index b852f794cc..be04c28b33 100644
--- a/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.WhispersClient.SendWhisper.g.verified.cs
+++ b/src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Twitch/SystemTextJson/_#G.WhispersClient.SendWhisper.g.verified.cs
@@ -30,7 +30,7 @@ public partial class WhispersClient
 
             using var httpRequest = new global::System.Net.Http.HttpRequestMessage(
                 method: global::System.Net.Http.HttpMethod.Post,
-                requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + $"/whispers?from_user_id={fromUserId}&to_user_id={toUserId}", global::System.UriKind.RelativeOrAbsolute));
+                requestUri: new global::System.Uri(_httpClient.BaseAddress?.GetLeftPart(global::System.UriPartial.Authority) + $"/whispers?from_user_id={fromUserId}&to_user_id={toUserId}", global::System.UriKind.RelativeOrAbsolute));
             var __json = global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions);
             httpRequest.Content = new global::System.Net.Http.StringContent(
                 content: __json,
diff --git a/src/tests/OpenApiGenerator.UnitTests/Tests.SmartNamedAnyOfNames.cs b/src/tests/OpenApiGenerator.UnitTests/Tests.SmartNamedAnyOfNames.cs
index d1d5699577..7b45dff4b7 100644
--- a/src/tests/OpenApiGenerator.UnitTests/Tests.SmartNamedAnyOfNames.cs
+++ b/src/tests/OpenApiGenerator.UnitTests/Tests.SmartNamedAnyOfNames.cs
@@ -12,4 +12,13 @@ public void SmartNamedAnyOfNames_Valid()
             typeName: "ChatCompletionRequestMessageContentPartText",
             className: "ChatCompletionRequestMessageContentPart").Should().Be("Text");
     }
+    
+    [TestMethod]
+    public void Url_Concat()
+    {
+        var baseUri = new Uri("https://localhost:7293");
+        
+        new Uri(baseUri.GetLeftPart(UriPartial.Authority) + "/api/Stats", UriKind.RelativeOrAbsolute)
+            .Should().Be(new Uri("https://localhost:7293/api/Stats"));
+    }
 }
\ No newline at end of file