diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
index 460443c091a2..a787cfd640db 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/RateLimitProvider`1.mustache
@@ -1,6 +1,5 @@
 // <auto-generated>
 {{>partial_header}}
-
 {{#nrt}}
 #nullable enable
 
@@ -17,21 +16,21 @@ namespace {{packageName}}.{{clientPackage}}
     /// <typeparam name="TTokenBase"></typeparam>
     {{>visibility}} class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new{{^net70OrLater}} Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>{{/net70OrLater}}();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new{{^net70OrLater}} Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>{{/net70OrLater}}();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             {{#lambda.copy}}
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -45,7 +44,7 @@ namespace {{packageName}}.{{clientPackage}}
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -65,7 +64,7 @@ namespace {{packageName}}.{{clientPackage}}
             {{/hasApiKeyMethods}}
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     {{#hasApiKeyMethods}}
                     if (token is ApiKeyToken apiKeyToken)
@@ -86,7 +85,7 @@ namespace {{packageName}}.{{clientPackage}}
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}})
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}})
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>{{nrt?}} tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache
index 05f06b4a7a58..d4d520e67c1d 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenBase.mustache
@@ -19,8 +19,8 @@ namespace {{packageName}}.{{clientPackage}}
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler{{nrt?}} TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler{{nrt?}} TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache
index 788539fa411e..21dc823e64f5 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/TokenProvider`1.mustache
@@ -1,6 +1,5 @@
 // <auto-generated>
 {{>partial_header}}
-
 {{#nrt}}
 #nullable enable
 
@@ -17,25 +16,6 @@ namespace {{packageName}}
     /// </summary>
     {{>visibility}} abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}});
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default{{^netstandard20OrLater}}(global::System.Threading.CancellationToken){{/netstandard20OrLater}});
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index ec0d2bb90cca..0f1476c40c26 100644
--- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 9cce679dda95..41825a6caa05 100644
--- a/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/ComposedEnum/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 59b5c1ada6d3..e391d54816c1 100644
--- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 739d9b6c73a3..4a2eeb313648 100644
--- a/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/HelloWorld/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 8fb6d87aa919..47f04ad710a3 100644
--- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 5ecc493e02a8..e3393fd59add 100644
--- a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 9ed9bc728c44..56f0a7675aec 100644
--- a/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/OneOfList/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 8cfa7f3c7fa9..37880748aed6 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -8,7 +8,6 @@
  * Contact: support@files.com
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -23,15 +22,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -42,7 +41,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -50,16 +49,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -75,7 +74,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index e49f379da03f..a65bd07d9681 100644
--- a/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/latest/Tags/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -8,7 +8,6 @@
  * Contact: support@files.com
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -23,25 +22,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 255e53a90a8c..7b0510910777 100644
--- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index f133fd92efae..16359b31aa40 100644
--- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 24c979203c4e..be9379a5634d 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 9616a3fc214f..aedb1cef12fa 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,15 +21,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -49,16 +48,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -74,7 +73,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 24c979203c4e..be9379a5634d 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 9616a3fc214f..aedb1cef12fa 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,15 +21,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -49,16 +48,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -74,7 +73,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 690096f1dccf..63af49ff9e42 100644
--- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 465706d25559..36ae5069699f 100644
--- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 5d06652a0982..79b86c53e0cd 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 4298caad9eec..c96d82895566 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index a70222b1eb66..e41f3d33abf7 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index ca97f59db584..08831f405128 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index a70222b1eb66..e41f3d33abf7 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index ca97f59db584..08831f405128 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 900240c8e5c8..5fe566880915 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index a70222b1eb66..e41f3d33abf7 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index ca97f59db584..08831f405128 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 900240c8e5c8..5fe566880915 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 621de80e9d42..6443e1b673a8 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 97408acc9bb7..a7c8e2a4567e 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 5d06652a0982..79b86c53e0cd 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 4298caad9eec..c96d82895566 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index a70222b1eb66..e41f3d33abf7 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index ca97f59db584..08831f405128 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index a70222b1eb66..e41f3d33abf7 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index ca97f59db584..08831f405128 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 900240c8e5c8..5fe566880915 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index a70222b1eb66..e41f3d33abf7 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index ca97f59db584..08831f405128 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 900240c8e5c8..5fe566880915 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 621de80e9d42..6443e1b673a8 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,33 +19,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 97408acc9bb7..a7c8e2a4567e 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 255e53a90a8c..7b0510910777 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index f133fd92efae..16359b31aa40 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 24c979203c4e..be9379a5634d 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 9616a3fc214f..aedb1cef12fa 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,15 +21,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -49,16 +48,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -74,7 +73,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 24c979203c4e..be9379a5634d 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 9616a3fc214f..aedb1cef12fa 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,15 +21,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -49,16 +48,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -74,7 +73,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 690096f1dccf..63af49ff9e42 100644
--- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 465706d25559..36ae5069699f 100644
--- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 255e53a90a8c..7b0510910777 100644
--- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index f133fd92efae..16359b31aa40 100644
--- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 24c979203c4e..be9379a5634d 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 9616a3fc214f..aedb1cef12fa 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,15 +21,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -49,16 +48,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -74,7 +73,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 50446820f7df..413887f07db1 100644
--- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 2f72d7a0a40f..0f375142c129 100644
--- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 0.0.1
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 24c979203c4e..be9379a5634d 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 9616a3fc214f..aedb1cef12fa 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,15 +21,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -41,7 +40,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -49,16 +48,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -74,7 +73,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 7921531915d3..2d668528ef65 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 690096f1dccf..63af49ff9e42 100644
--- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,33 +21,33 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
-            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+            global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
             {
-                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
             };
 
             AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     token.TokenBecameAvailable += ((sender) => availableToken.Value.Writer.TryWrite((TTokenBase)sender));
                 }
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase>? tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
index 3f713a2ef4bb..aa6df45cf7c0 100644
--- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -17,8 +17,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler? TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler? TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 465706d25559..36ae5069699f 100644
--- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 #nullable enable
 
 using System;
@@ -22,25 +21,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
index 900240c8e5c8..5fe566880915 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/RateLimitProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -20,15 +19,15 @@ namespace Org.OpenAPITools.Client
     /// <typeparam name="TTokenBase"></typeparam>
     public class RateLimitProvider<TTokenBase> : TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        internal Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
+        public Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>> AvailableTokens { get; } = new Dictionary<string, global::System.Threading.Channels.Channel<TTokenBase>>();
 
         /// <summary>
         /// Instantiates a ThrottledTokenProvider. Your tokens will be rate limited based on the token's timeout.
         /// </summary>
         /// <param name="container"></param>
-        public RateLimitProvider(TokenContainer<TTokenBase> container) : base(container.Tokens)
+        public RateLimitProvider(TokenContainer<TTokenBase> container) : base()
         {
-            foreach(TTokenBase token in _tokens)
+            foreach(TTokenBase token in container.Tokens)
                 token.StartTimer(token.Timeout ?? TimeSpan.FromMilliseconds(40));
 
             if (container is TokenContainer<ApiKeyToken> apiKeyTokenContainer)
@@ -39,7 +38,7 @@ namespace Org.OpenAPITools.Client
                 {
                     global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(apiKeyTokenContainer.Tokens.Count(t => ClientUtils.ApiKeyHeaderToString(t.Header).Equals(header)))
                     {
-                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                        FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                     };
 
                     AvailableTokens.Add(header, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
@@ -47,16 +46,16 @@ namespace Org.OpenAPITools.Client
             }
             else
             {
-                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(_tokens.Length)
+                global::System.Threading.Channels.BoundedChannelOptions options = new global::System.Threading.Channels.BoundedChannelOptions(container.Tokens.Count)
                 {
-                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropWrite
+                    FullMode = global::System.Threading.Channels.BoundedChannelFullMode.DropOldest
                 };
 
                 AvailableTokens.Add(string.Empty, global::System.Threading.Channels.Channel.CreateBounded<TTokenBase>(options));
             }
 
             foreach (var availableToken in AvailableTokens)
-                foreach(TTokenBase token in _tokens)
+                foreach(TTokenBase token in container.Tokens)
                 {
                     if (token is ApiKeyToken apiKeyToken)
                     {
@@ -72,7 +71,7 @@ namespace Org.OpenAPITools.Client
         }
 
         /// <inheritdoc/>
-        protected internal override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
+        public override async System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default)
         {
             if (!AvailableTokens.TryGetValue(header, out global::System.Threading.Channels.Channel<TTokenBase> tokens))
                 throw new KeyNotFoundException($"Could not locate a token for header '{header}'.");
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
index ec843104cafe..11cddf564b33 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenBase.cs
@@ -15,8 +15,8 @@ namespace Org.OpenAPITools.Client
 
 
         internal TimeSpan? Timeout { get; set; }
-        internal delegate void TokenBecameAvailableEventHandler(object sender);
-        internal event TokenBecameAvailableEventHandler TokenBecameAvailable;
+        public delegate void TokenBecameAvailableEventHandler(object sender);
+        public event TokenBecameAvailableEventHandler TokenBecameAvailable;
 
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
index 1762954581b5..1a9a30116ee5 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools/Client/TokenProvider`1.cs
@@ -7,7 +7,6 @@
  * The version of the OpenAPI document: 1.0.0
  * Generated by: https://github.com/openapitools/openapi-generator.git
  */
-
 using System;
 using System.Linq;
 using System.Collections.Generic;
@@ -20,25 +19,6 @@ namespace Org.OpenAPITools
     /// </summary>
     public abstract class TokenProvider<TTokenBase> where TTokenBase : TokenBase
     {
-        /// <summary>
-        /// The array of tokens.
-        /// </summary>
-        protected TTokenBase[] _tokens;
-
-        /// <summary>
-        /// Gets an authentication token to be used in request authorization.
-        /// </summary>
-        /// <param name="header"></param>
-        /// <param name="cancellation"></param>
-        protected internal abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
-
-        /// <summary>
-        /// Instantiates a TokenProvider.
-        /// </summary>
-        /// <param name="tokens"></param>
-        public TokenProvider(IEnumerable<TTokenBase> tokens)
-        {
-            _tokens = tokens.ToArray();
-        }
+        public abstract System.Threading.Tasks.ValueTask<TTokenBase> GetAsync(string header = "", System.Threading.CancellationToken cancellation = default);
     }
 }
\ No newline at end of file