diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
index 7a5315a69b29..75fd34aebda5 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache
@@ -50,7 +50,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.function.Supplier;
 import java.util.TimeZone;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -127,8 +126,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
   protected Map<String, Authentication> authentications;
 
-  protected Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
-  protected Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
+  protected ThreadLocal<Integer> lastStatusCode = new ThreadLocal<>();
+  protected ThreadLocal<Map<String, List<String>>> lastResponseHeaders = new ThreadLocal<>();
 
   protected DateFormat dateFormat;
 
@@ -284,7 +283,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    */
   @Deprecated
   public int getStatusCode() {
-    return lastStatusCodeByThread.get(Thread.currentThread().getId());
+    return lastStatusCode.get();
   }
 
   /**
@@ -293,7 +292,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    */
   @Deprecated
   public Map<String, List<String>> getResponseHeaders() {
-    return lastResponseHeadersByThread.get(Thread.currentThread().getId());
+    return lastResponseHeaders.get();
   }
 
   /**
@@ -1015,13 +1014,13 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
     int statusCode = response.getCode();
-    lastStatusCodeByThread.put(Thread.currentThread().getId(), statusCode);
+    lastStatusCode.set(statusCode);
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
     Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
-    lastResponseHeadersByThread.put(Thread.currentThread().getId(), responseHeaders);
+    lastResponseHeaders.set(responseHeaders);
 
     if (isSuccessfulStatus(statusCode)) {
       return this.deserialize(response, returnType);
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
index fde4c3e5abb7..f656fc0144f3 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -56,7 +56,6 @@
 import java.util.Date;
 import java.util.function.Supplier;
 import java.util.TimeZone;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -104,8 +103,8 @@ public class ApiClient extends JavaTimeFormatter {
 
   protected Map<String, Authentication> authentications;
 
-  protected Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
-  protected Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
+  protected ThreadLocal<Integer> lastStatusCode = new ThreadLocal<>();
+  protected ThreadLocal<Map<String, List<String>>> lastResponseHeaders = new ThreadLocal<>();
 
   protected DateFormat dateFormat;
 
@@ -254,7 +253,7 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
    */
   @Deprecated
   public int getStatusCode() {
-    return lastStatusCodeByThread.get(Thread.currentThread().getId());
+    return lastStatusCode.get();
   }
 
   /**
@@ -263,7 +262,7 @@ public int getStatusCode() {
    */
   @Deprecated
   public Map<String, List<String>> getResponseHeaders() {
-    return lastResponseHeadersByThread.get(Thread.currentThread().getId());
+    return lastResponseHeaders.get();
   }
 
   /**
@@ -932,13 +931,13 @@ protected Cookie buildCookie(String key, String value, URI uri) {
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
     int statusCode = response.getCode();
-    lastStatusCodeByThread.put(Thread.currentThread().getId(), statusCode);
+    lastStatusCode.set(statusCode);
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
     Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
-    lastResponseHeadersByThread.put(Thread.currentThread().getId(), responseHeaders);
+    lastResponseHeaders.set(responseHeaders);
 
     if (isSuccessfulStatus(statusCode)) {
       return this.deserialize(response, returnType);
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
index 7966f3003b39..28ac6e971d32 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -56,7 +56,6 @@
 import java.util.Date;
 import java.util.function.Supplier;
 import java.util.TimeZone;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -149,8 +148,8 @@ public class ApiClient extends JavaTimeFormatter {
 
   protected Map<String, Authentication> authentications;
 
-  protected Map<Long, Integer> lastStatusCodeByThread = new ConcurrentHashMap<>();
-  protected Map<Long, Map<String, List<String>>> lastResponseHeadersByThread = new ConcurrentHashMap<>();
+  protected ThreadLocal<Integer> lastStatusCode = new ThreadLocal<>();
+  protected ThreadLocal<Map<String, List<String>>> lastResponseHeaders = new ThreadLocal<>();
 
   protected DateFormat dateFormat;
 
@@ -302,7 +301,7 @@ public ApiClient setServerVariables(Map<String, String> serverVariables) {
    */
   @Deprecated
   public int getStatusCode() {
-    return lastStatusCodeByThread.get(Thread.currentThread().getId());
+    return lastStatusCode.get();
   }
 
   /**
@@ -311,7 +310,7 @@ public int getStatusCode() {
    */
   @Deprecated
   public Map<String, List<String>> getResponseHeaders() {
-    return lastResponseHeadersByThread.get(Thread.currentThread().getId());
+    return lastResponseHeaders.get();
   }
 
   /**
@@ -1025,13 +1024,13 @@ protected Cookie buildCookie(String key, String value, URI uri) {
 
   protected <T> T processResponse(CloseableHttpResponse response, TypeReference<T> returnType) throws ApiException, IOException, ParseException {
     int statusCode = response.getCode();
-    lastStatusCodeByThread.put(Thread.currentThread().getId(), statusCode);
+    lastStatusCode.set(statusCode);
     if (statusCode == HttpStatus.SC_NO_CONTENT) {
       return null;
     }
 
     Map<String, List<String>> responseHeaders = transformResponseHeaders(response.getHeaders());
-    lastResponseHeadersByThread.put(Thread.currentThread().getId(), responseHeaders);
+    lastResponseHeaders.set(responseHeaders);
 
     if (isSuccessfulStatus(statusCode)) {
       return this.deserialize(response, returnType);