diff --git a/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache b/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache
index 49499873c1d..ca8c3f78582 100644
--- a/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache
+++ b/modules/openapi-generator/src/main/resources/r/ApiResponse.mustache
@@ -5,12 +5,18 @@
 #' @format An \code{R6Class} generator object
 #' @field content The deserialized response body.
 #' @field response The raw response from the endpoint.
+#' @field status_code The HTTP response status code.
+#' @field status_code_desc The brief descriptoin of the HTTP response status code.
+#' @field headers The HTTP response headers.
 #' @export
 ApiResponse <- R6::R6Class(
   "ApiResponse",
   public = list(
     content = NULL,
     response = NULL,
+    status_code = NULL,
+    status_code_desc = NULL,
+    headers = NULL,
     #' Initialize a new ApiResponse class.
     #'
     #' @description
@@ -18,10 +24,20 @@ ApiResponse <- R6::R6Class(
     #'
     #' @param content The deserialized response body.
     #' @param response The raw response from the endpoint.
+    #' @param status_code The HTTP response status code.
+    #' @param status_code_desc The brief description of the HTTP response status code.
+    #' @param headers The HTTP response headers.
     #' @export
-    initialize = function(content, response) {
+    initialize = function(content = NULL,
+                          response = NULL,
+                          status_code = NULL,
+                          status_code_desc = NULL,
+                          headers = NULL) {
       self$content <- content
       self$response <- response
+      self$status_code <- status_code
+      self$status_code_desc <- status_code_desc
+      self$headers <- headers
     }
   )
 )
diff --git a/modules/openapi-generator/src/main/resources/r/api.mustache b/modules/openapi-generator/src/main/resources/r/api.mustache
index a4cd30b7641..e7b94ae3752 100644
--- a/modules/openapi-generator/src/main/resources/r/api.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api.mustache
@@ -194,22 +194,21 @@
     #' @return {{{returnType}}}{{^returnType}}void{{/returnType}}
     #' @export
     {{{operationId}}} = function({{#requiredParams}}{{paramName}}, {{/requiredParams}}{{#optionalParams}}{{paramName}} = {{^defaultValue}}NULL{{/defaultValue}}{{{defaultValue}}}, {{/optionalParams}}{{#vendorExtensions.x-streaming}}stream_callback = NULL, {{/vendorExtensions.x-streaming}}{{#returnType}}data_file = NULL, {{/returnType}}...) {
-      api_response <- self${{{operationId}}}{{WithHttpInfo}}({{#allParams}}{{paramName}}, {{/allParams}}{{#vendorExtensions.x-streaming}}stream_callback = stream_callback, {{/vendorExtensions.x-streaming}}{{#returnType}}data_file = data_file, {{/returnType}}...)
+      local_var_response <- self${{{operationId}}}{{WithHttpInfo}}({{#allParams}}{{paramName}}, {{/allParams}}{{#vendorExtensions.x-streaming}}stream_callback = stream_callback, {{/vendorExtensions.x-streaming}}{{#returnType}}data_file = data_file, {{/returnType}}...)
       {{#vendorExtensions.x-streaming}}
       if (typeof(stream_callback) == "closure") { # return void if streaming is enabled
         return(invisible(NULL))
       }
 
       {{/vendorExtensions.x-streaming}}
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' {{{summary}}}
@@ -368,10 +367,10 @@
       }
 
       {{/vendorExtensions.x-streaming}}
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         {{#returnType}}
         {{#isPrimitiveType}}
-        local_var_content <- httr::content(
+        local_var_content <- local_var_resp$response
             local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE
         )
         # save response in a file
@@ -384,11 +383,11 @@
         {{^isPrimitiveType}}
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "{{returnType}}", loadNamespace("{{packageName}}")),
+          self$api_client$deserialize(local_var_resp$response, "{{returnType}}", loadNamespace("{{packageName}}")),
           error = function(e) {
            {{#useDefaultExceptionHandling}}
              stop("Failed to deserialize response")
@@ -400,18 +399,19 @@
            {{/useRlangExceptionHandling}}
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
+        local_var_resp$content <- deserialized_resp_obj
         {{/isPrimitiveType}}
         {{/returnType}}
         {{^returnType}}
         {{! Returning the ApiResponse object with NULL object when the endpoint doesn't return anything}}
-        ApiResponse$new(NULL, local_var_resp)
+        local_var_resp$content <- NULL
         {{/returnType}}
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
       {{#returnExceptionOnFailure}}
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         {{#useDefaultExceptionHandling}}
         stop(local_var_error_msg)
@@ -423,11 +423,11 @@
         {{/useRlangExceptionHandling}}
       {{/returnExceptionOnFailure}}
       {{^returnExceptionOnFailure}}
-        ApiResponse$new(paste("Server returned ", httr::status_code(local_var_resp), " response status code."), local_var_resp)
+        ApiResponse$new(paste("Server returned ", local_var_resp$status_code, " response status code."), local_var_resp)
       {{/returnExceptionOnFailure}}
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
       {{#returnExceptionOnFailure}}
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
@@ -443,9 +443,9 @@
       {{^returnExceptionOnFailure}}
         ApiResponse$new("API client error", local_var_resp)
       {{/returnExceptionOnFailure}}
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
       {{#returnExceptionOnFailure}}
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -459,7 +459,10 @@
         {{/useRlangExceptionHandling}}
       {{/returnExceptionOnFailure}}
       {{^returnExceptionOnFailure}}
-        ApiResponse$new("API server error", local_var_resp)
+        if (is.null(local_var_resp$response) || local_var_resp$response == "") {
+          local_var_resp$response <- "API server error"
+        }
+        return local_var_resp
       {{/returnExceptionOnFailure}}
       }
     }{{^-last}},{{/-last}}
diff --git a/modules/openapi-generator/src/main/resources/r/api_client.mustache b/modules/openapi-generator/src/main/resources/r/api_client.mustache
index 8e78e508898..3c04fa2b368 100644
--- a/modules/openapi-generator/src/main/resources/r/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api_client.mustache
@@ -145,7 +145,6 @@ ApiClient  <- R6::R6Class(
 
       resp <- self$Execute(url, method, query_params, header_params, accepts, content_types,
                            body, stream_callback = stream_callback, ...)
-      status_code <- httr::status_code(resp)
 
       if (is.null(self$max_retry_attempts)) {
         self$max_retry_attempts <- 3
@@ -154,10 +153,9 @@ ApiClient  <- R6::R6Class(
       if (!is.null(self$retry_status_codes)) {
 
         for (i in 1 : self$max_retry_attempts) {
-          if (status_code %in% self$retry_status_codes) {
+          if (resp$status_code %in% self$retry_status_codes) {
             Sys.sleep((2 ^ i) + stats::runif(n = 1, min = 0, max = 1))
             resp <- self$Execute(url, method, query_params, header_params, body, stream_callback = stream_callback, ...)
-            status_code <- httr::status_code(resp)
           } else {
             break
           }
@@ -204,84 +202,95 @@ ApiClient  <- R6::R6Class(
         headers['Content-Type'] = content_type
       }
 
-      if (method == "GET") {
-        if (typeof(stream_callback) == "closure") {
+      if (typeof(stream_callback) == "closure") { # stream data
+        if (method == "GET") {
           httr::GET(url, query = query_params, headers, http_timeout,
                     httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::GET(url, query = query_params, headers, http_timeout,
-                    httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "POST") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "POST") {
           httr::POST(url, query = query_params, headers, body = body,
                      httr::content_type("application/json"), http_timeout,
                      httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::POST(url, query = query_params, headers, body = body,
-                     httr::content_type("application/json"), http_timeout,
-                     httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "PUT") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "PUT") {
           httr::PUT(url, query = query_params, headers, body = body,
                     httr::content_type("application/json"), http_timeout,
                     http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::PUT(url, query = query_params, headers, body = body,
-                    httr::content_type("application/json"), http_timeout,
-                    http_timeout, httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "PATCH") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "PATCH") {
           httr::PATCH(url, query = query_params, headers, body = body,
                       httr::content_type("application/json"), http_timeout,
                       http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::PATCH(url, query = query_params, headers, body = body,
-                      httr::content_type("application/json"), http_timeout,
-                      http_timeout, httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "HEAD") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "HEAD") {
           httr::HEAD(url, query = query_params, headers, http_timeout,
                      http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::HEAD(url, query = query_params, headers, http_timeout,
-                     http_timeout, httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "DELETE") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "DELETE") {
           httr::DELETE(url, query = query_params, headers, http_timeout,
                        http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
         } else {
-          httr::DELETE(url, query = query_params, headers, http_timeout,
-                       http_timeout, httr::user_agent(self$`user_agent`), ...)
+          err_msg <- "Http method must be `GET`, `HEAD`, `OPTIONS`, `POST`, `PATCH`, `PUT` or `DELETE`."
+          {{#useDefaultExceptionHandling}}
+          stop(err_msg)
+          {{/useDefaultExceptionHandling}}
+          {{#useRlangExceptionHandling}}
+          rlang::abort(message = err_msg,
+                       .subclass = "ApiException",
+                       ApiException = ApiException$new(status = 0, reason = err_msg))
+          {{/useRlangExceptionHandling}}
         }
-      } else {
-        err_msg <- "Http method must be `GET`, `HEAD`, `OPTIONS`, `POST`, `PATCH`, `PUT` or `DELETE`."
-        {{#useDefaultExceptionHandling}}
-        stop(err_msg)
-        {{/useDefaultExceptionHandling}}
-        {{#useRlangExceptionHandling}}
-        rlang::abort(message = err_msg,
-                     .subclass = "ApiException",
-                     ApiException = ApiException$new(status = 0, reason = err_msg))
-        {{/useRlangExceptionHandling}}
+      } else { # no streaming
+        if (method == "GET") {
+          httr_response <- httr::GET(url, query = query_params, headers, http_timeout,
+                    httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "POST") {
+          httr_response <- httr::POST(url, query = query_params, headers, body = body,
+                     httr::content_type("application/json"), http_timeout,
+                     httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "PUT") {
+          httr_response <- httr::PUT(url, query = query_params, headers, body = body,
+                    httr::content_type("application/json"), http_timeout,
+                    http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "PATCH") {
+          httr_response <- httr::PATCH(url, query = query_params, headers, body = body,
+                      httr::content_type("application/json"), http_timeout,
+                      http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "HEAD") {
+          httr_response <- httr::HEAD(url, query = query_params, headers, http_timeout,
+                     http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "DELETE") {
+          httr_response <- httr::DELETE(url, query = query_params, headers, http_timeout,
+                       http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else {
+          err_msg <- "Http method must be `GET`, `HEAD`, `OPTIONS`, `POST`, `PATCH`, `PUT` or `DELETE`."
+          {{#useDefaultExceptionHandling}}
+          stop(err_msg)
+          {{/useDefaultExceptionHandling}}
+          {{#useRlangExceptionHandling}}
+          rlang::abort(message = err_msg,
+                       .subclass = "ApiException",
+                       ApiException = ApiException$new(status = 0, reason = err_msg))
+          {{/useRlangExceptionHandling}}
+        }
+
+        # return ApiResponse
+        api_response <- ApiResponse$new()
+        api_response$status_code <- httr::status_code(httr_response) 
+        api_response$status_code_desc <- httr::http_status(httr_response)$reason
+        api_response$response <- httr::content(httr_response, "text", encoding = "UTF-8")
+        api_response$headers <- httr::headers(httr_response)
+
+        api_response
       }
     },
-    #' Deserialize the content of api response to the given type.
+    #' Deserialize the content of API response to the given type.
     #'
     #' @description
-    #' Deserialize the content of api response to the given type.
+    #' Deserialize the content of API response to the given type.
     #'
-    #' @param resp Response object.
+    #' @param raw_response Raw response.
     #' @param return_type R return type.
     #' @param pkg_env Package environment.
     #' @return Deserialized object.
     #' @export
-    deserialize = function(resp, return_type, pkg_env) {
-      resp_obj <- jsonlite::fromJSON(httr::content(resp, "text", encoding = "UTF-8"))
+    deserialize = function(raw_response, return_type, pkg_env) {
+      resp_obj <- jsonlite::fromJSON(raw_response)
       self$deserializeObj(resp_obj, return_type, pkg_env)
     },
     #' Deserialize the response from jsonlite object based on the given type
@@ -343,8 +352,7 @@ ApiClient  <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
-    #' return it. Otherwise, return the first one, if any.
+    #' Return a propery header (for accept or content-type).
     #'
     #' @description
     #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
diff --git a/modules/openapi-generator/src/main/resources/r/api_exception.mustache b/modules/openapi-generator/src/main/resources/r/api_exception.mustache
index 80c06e32661..76473661503 100644
--- a/modules/openapi-generator/src/main/resources/r/api_exception.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api_exception.mustache
@@ -34,15 +34,15 @@ ApiException <- R6::R6Class(
     initialize = function(status = NULL, reason = NULL, http_response = NULL) {
       if (!is.null(http_response)) {
         self$status <- http_response$status_code
-        errorMsg <- toString(content(http_response))
-        if (errorMsg == "") {
+        errorMsg <- http_response$response
+        if (is.null(errorMsg) || errorMsg == "") {
           errorMsg <- "Api exception encountered. No details given."
         }
         self$body <- errorMsg
         self$headers <- http_response$headers
-        self$reason <- httr::http_status(http_response)$reason
+        self$reason <- http_response$http_status_desc
         {{#errorObjectType}}
-        self$errorObject <- {{errorObjectType}}$new()$fromJSONString(content(http_response, "text"))
+        self$errorObject <- {{errorObjectType}}$new()$fromJSONString(http_response$response)
         {{/errorObjectType}}
       } else {
         self$status <- status
diff --git a/samples/client/petstore/R/R/api_client.R b/samples/client/petstore/R/R/api_client.R
index 77ed87bd912..7f45c5c1b07 100644
--- a/samples/client/petstore/R/R/api_client.R
+++ b/samples/client/petstore/R/R/api_client.R
@@ -150,7 +150,6 @@ ApiClient  <- R6::R6Class(
 
       resp <- self$Execute(url, method, query_params, header_params, accepts, content_types,
                            body, stream_callback = stream_callback, ...)
-      status_code <- httr::status_code(resp)
 
       if (is.null(self$max_retry_attempts)) {
         self$max_retry_attempts <- 3
@@ -159,10 +158,9 @@ ApiClient  <- R6::R6Class(
       if (!is.null(self$retry_status_codes)) {
 
         for (i in 1 : self$max_retry_attempts) {
-          if (status_code %in% self$retry_status_codes) {
+          if (resp$status_code %in% self$retry_status_codes) {
             Sys.sleep((2 ^ i) + stats::runif(n = 1, min = 0, max = 1))
             resp <- self$Execute(url, method, query_params, header_params, body, stream_callback = stream_callback, ...)
-            status_code <- httr::status_code(resp)
           } else {
             break
           }
@@ -208,79 +206,85 @@ ApiClient  <- R6::R6Class(
         headers['Content-Type'] = content_type
       }
 
-      if (method == "GET") {
-        if (typeof(stream_callback) == "closure") {
+      if (typeof(stream_callback) == "closure") { # stream data
+        if (method == "GET") {
           httr::GET(url, query = query_params, headers, http_timeout,
                     httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::GET(url, query = query_params, headers, http_timeout,
-                    httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "POST") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "POST") {
           httr::POST(url, query = query_params, headers, body = body,
                      httr::content_type("application/json"), http_timeout,
                      httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::POST(url, query = query_params, headers, body = body,
-                     httr::content_type("application/json"), http_timeout,
-                     httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "PUT") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "PUT") {
           httr::PUT(url, query = query_params, headers, body = body,
                     httr::content_type("application/json"), http_timeout,
                     http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::PUT(url, query = query_params, headers, body = body,
-                    httr::content_type("application/json"), http_timeout,
-                    http_timeout, httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "PATCH") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "PATCH") {
           httr::PATCH(url, query = query_params, headers, body = body,
                       httr::content_type("application/json"), http_timeout,
                       http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::PATCH(url, query = query_params, headers, body = body,
-                      httr::content_type("application/json"), http_timeout,
-                      http_timeout, httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "HEAD") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "HEAD") {
           httr::HEAD(url, query = query_params, headers, http_timeout,
                      http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
-        } else {
-          httr::HEAD(url, query = query_params, headers, http_timeout,
-                     http_timeout, httr::user_agent(self$`user_agent`), ...)
-        }
-      } else if (method == "DELETE") {
-        if (typeof(stream_callback) == "closure") {
+        } else if (method == "DELETE") {
           httr::DELETE(url, query = query_params, headers, http_timeout,
                        http_timeout, httr::user_agent(self$`user_agent`), write_stream(stream_callback), ...)
         } else {
-          httr::DELETE(url, query = query_params, headers, http_timeout,
-                       http_timeout, httr::user_agent(self$`user_agent`), ...)
+          err_msg <- "Http method must be `GET`, `HEAD`, `OPTIONS`, `POST`, `PATCH`, `PUT` or `DELETE`."
+          rlang::abort(message = err_msg,
+                       .subclass = "ApiException",
+                       ApiException = ApiException$new(status = 0, reason = err_msg))
         }
-      } else {
-        err_msg <- "Http method must be `GET`, `HEAD`, `OPTIONS`, `POST`, `PATCH`, `PUT` or `DELETE`."
-        rlang::abort(message = err_msg,
-                     .subclass = "ApiException",
-                     ApiException = ApiException$new(status = 0, reason = err_msg))
+      } else { # no streaming
+        if (method == "GET") {
+          httr_response <- httr::GET(url, query = query_params, headers, http_timeout,
+                    httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "POST") {
+          httr_response <- httr::POST(url, query = query_params, headers, body = body,
+                     httr::content_type("application/json"), http_timeout,
+                     httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "PUT") {
+          httr_response <- httr::PUT(url, query = query_params, headers, body = body,
+                    httr::content_type("application/json"), http_timeout,
+                    http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "PATCH") {
+          httr_response <- httr::PATCH(url, query = query_params, headers, body = body,
+                      httr::content_type("application/json"), http_timeout,
+                      http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "HEAD") {
+          httr_response <- httr::HEAD(url, query = query_params, headers, http_timeout,
+                     http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else if (method == "DELETE") {
+          httr_response <- httr::DELETE(url, query = query_params, headers, http_timeout,
+                       http_timeout, httr::user_agent(self$`user_agent`), ...)
+        } else {
+          err_msg <- "Http method must be `GET`, `HEAD`, `OPTIONS`, `POST`, `PATCH`, `PUT` or `DELETE`."
+          rlang::abort(message = err_msg,
+                       .subclass = "ApiException",
+                       ApiException = ApiException$new(status = 0, reason = err_msg))
+        }
+
+        # return ApiResponse
+        api_response <- ApiResponse$new()
+        api_response$status_code <- httr::status_code(httr_response) 
+        api_response$status_code_desc <- httr::http_status(httr_response)$reason
+        api_response$response <- httr::content(httr_response, "text", encoding = "UTF-8")
+        api_response$headers <- httr::headers(httr_response)
+
+        api_response
       }
     },
-    #' Deserialize the content of api response to the given type.
+    #' Deserialize the content of API response to the given type.
     #'
     #' @description
-    #' Deserialize the content of api response to the given type.
+    #' Deserialize the content of API response to the given type.
     #'
-    #' @param resp Response object.
+    #' @param raw_response Raw response.
     #' @param return_type R return type.
     #' @param pkg_env Package environment.
     #' @return Deserialized object.
     #' @export
-    deserialize = function(resp, return_type, pkg_env) {
-      resp_obj <- jsonlite::fromJSON(httr::content(resp, "text", encoding = "UTF-8"))
+    deserialize = function(raw_response, return_type, pkg_env) {
+      resp_obj <- jsonlite::fromJSON(raw_response)
       self$deserializeObj(resp_obj, return_type, pkg_env)
     },
     #' Deserialize the response from jsonlite object based on the given type
@@ -342,8 +346,7 @@ ApiClient  <- R6::R6Class(
       }
       return_obj
     },
-    #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
-    #' return it. Otherwise, return the first one, if any.
+    #' Return a propery header (for accept or content-type).
     #'
     #' @description
     #' Return a propery header (for accept or content-type). If JSON-related MIME is found,
diff --git a/samples/client/petstore/R/R/api_exception.R b/samples/client/petstore/R/R/api_exception.R
index 41bee0bb203..e198854bf34 100644
--- a/samples/client/petstore/R/R/api_exception.R
+++ b/samples/client/petstore/R/R/api_exception.R
@@ -36,14 +36,14 @@ ApiException <- R6::R6Class(
     initialize = function(status = NULL, reason = NULL, http_response = NULL) {
       if (!is.null(http_response)) {
         self$status <- http_response$status_code
-        errorMsg <- toString(content(http_response))
-        if (errorMsg == "") {
+        errorMsg <- http_response$response
+        if (is.null(errorMsg) || errorMsg == "") {
           errorMsg <- "Api exception encountered. No details given."
         }
         self$body <- errorMsg
         self$headers <- http_response$headers
-        self$reason <- httr::http_status(http_response)$reason
-        self$errorObject <- ModelApiResponse$new()$fromJSONString(content(http_response, "text"))
+        self$reason <- http_response$http_status_desc
+        self$errorObject <- ModelApiResponse$new()$fromJSONString(http_response$response)
       } else {
         self$status <- status
         self$reason <- reason
diff --git a/samples/client/petstore/R/R/api_response.R b/samples/client/petstore/R/R/api_response.R
index 2362fd4e466..6035283a86d 100644
--- a/samples/client/petstore/R/R/api_response.R
+++ b/samples/client/petstore/R/R/api_response.R
@@ -12,12 +12,18 @@
 #' @format An \code{R6Class} generator object
 #' @field content The deserialized response body.
 #' @field response The raw response from the endpoint.
+#' @field status_code The HTTP response status code.
+#' @field status_code_desc The brief descriptoin of the HTTP response status code.
+#' @field headers The HTTP response headers.
 #' @export
 ApiResponse <- R6::R6Class(
   "ApiResponse",
   public = list(
     content = NULL,
     response = NULL,
+    status_code = NULL,
+    status_code_desc = NULL,
+    headers = NULL,
     #' Initialize a new ApiResponse class.
     #'
     #' @description
@@ -25,10 +31,20 @@ ApiResponse <- R6::R6Class(
     #'
     #' @param content The deserialized response body.
     #' @param response The raw response from the endpoint.
+    #' @param status_code The HTTP response status code.
+    #' @param status_code_desc The brief description of the HTTP response status code.
+    #' @param headers The HTTP response headers.
     #' @export
-    initialize = function(content, response) {
+    initialize = function(content = NULL,
+                          response = NULL,
+                          status_code = NULL,
+                          status_code_desc = NULL,
+                          headers = NULL) {
       self$content <- content
       self$response <- response
+      self$status_code <- status_code
+      self$status_code_desc <- status_code_desc
+      self$headers <- headers
     }
   )
 )
diff --git a/samples/client/petstore/R/R/fake_api.R b/samples/client/petstore/R/R/fake_api.R
index ac5d3955bc1..160863cea57 100644
--- a/samples/client/petstore/R/R/fake_api.R
+++ b/samples/client/petstore/R/R/fake_api.R
@@ -99,16 +99,15 @@ FakeApi <- R6::R6Class(
     #' @return User
     #' @export
     FakeDataFile = function(dummy, var_data_file = NULL, data_file = NULL, ...) {
-      api_response <- self$FakeDataFileWithHttpInfo(dummy, var_data_file, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$FakeDataFileWithHttpInfo(dummy, var_data_file, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' test data_file to ensure it's escaped correctly
@@ -156,39 +155,40 @@ FakeApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "User", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "User", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
diff --git a/samples/client/petstore/R/R/pet_api.R b/samples/client/petstore/R/R/pet_api.R
index 88b3b70342f..968e70d162b 100644
--- a/samples/client/petstore/R/R/pet_api.R
+++ b/samples/client/petstore/R/R/pet_api.R
@@ -544,16 +544,15 @@ PetApi <- R6::R6Class(
     #' @return Pet
     #' @export
     AddPet = function(pet, data_file = NULL, ...) {
-      api_response <- self$AddPetWithHttpInfo(pet, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$AddPetWithHttpInfo(pet, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Add a new pet to the store
@@ -609,39 +608,40 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "Pet", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "Pet", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -661,16 +661,15 @@ PetApi <- R6::R6Class(
     #' @return void
     #' @export
     DeletePet = function(pet_id, api_key = NULL, ...) {
-      api_response <- self$DeletePetWithHttpInfo(pet_id, api_key, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$DeletePetWithHttpInfo(pet_id, api_key, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Deletes a pet
@@ -721,26 +720,27 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -760,16 +760,15 @@ PetApi <- R6::R6Class(
     #' @return array[Pet]
     #' @export
     FindPetsByStatus = function(status, data_file = NULL, ...) {
-      api_response <- self$FindPetsByStatusWithHttpInfo(status, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$FindPetsByStatusWithHttpInfo(status, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Finds Pets by status
@@ -816,39 +815,40 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "array[Pet]", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "array[Pet]", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -868,16 +868,15 @@ PetApi <- R6::R6Class(
     #' @return array[Pet]
     #' @export
     FindPetsByTags = function(tags, data_file = NULL, ...) {
-      api_response <- self$FindPetsByTagsWithHttpInfo(tags, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$FindPetsByTagsWithHttpInfo(tags, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Finds Pets by tags
@@ -924,39 +923,40 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "array[Pet]", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "array[Pet]", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -976,16 +976,15 @@ PetApi <- R6::R6Class(
     #' @return Pet
     #' @export
     GetPetById = function(pet_id, data_file = NULL, ...) {
-      api_response <- self$GetPetByIdWithHttpInfo(pet_id, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$GetPetByIdWithHttpInfo(pet_id, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Find pet by ID
@@ -1033,39 +1032,40 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "Pet", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "Pet", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -1086,20 +1086,19 @@ PetApi <- R6::R6Class(
     #' @return Pet
     #' @export
     GetPetByIdStreaming = function(pet_id, stream_callback = NULL, data_file = NULL, ...) {
-      api_response <- self$GetPetByIdStreamingWithHttpInfo(pet_id, stream_callback = stream_callback, data_file = data_file, ...)
+      local_var_response <- self$GetPetByIdStreamingWithHttpInfo(pet_id, stream_callback = stream_callback, data_file = data_file, ...)
       if (typeof(stream_callback) == "closure") { # return void if streaming is enabled
         return(invisible(NULL))
       }
 
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Find pet by ID (streaming)
@@ -1156,39 +1155,40 @@ PetApi <- R6::R6Class(
         return(invisible(NULL))
       }
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "Pet", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "Pet", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -1208,16 +1208,15 @@ PetApi <- R6::R6Class(
     #' @return Pet
     #' @export
     UpdatePet = function(pet, data_file = NULL, ...) {
-      api_response <- self$UpdatePetWithHttpInfo(pet, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$UpdatePetWithHttpInfo(pet, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Update an existing pet
@@ -1267,39 +1266,40 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "Pet", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "Pet", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -1320,16 +1320,15 @@ PetApi <- R6::R6Class(
     #' @return void
     #' @export
     UpdatePetWithForm = function(pet_id, name = NULL, status = NULL, ...) {
-      api_response <- self$UpdatePetWithFormWithHttpInfo(pet_id, name, status, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$UpdatePetWithFormWithHttpInfo(pet_id, name, status, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Updates a pet in the store with form data
@@ -1383,26 +1382,27 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -1424,16 +1424,15 @@ PetApi <- R6::R6Class(
     #' @return ModelApiResponse
     #' @export
     UploadFile = function(pet_id, additional_metadata = NULL, file = NULL, data_file = NULL, ...) {
-      api_response <- self$UploadFileWithHttpInfo(pet_id, additional_metadata, file, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$UploadFileWithHttpInfo(pet_id, additional_metadata, file, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' uploads an image
@@ -1488,39 +1487,40 @@ PetApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "ModelApiResponse", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "ModelApiResponse", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
diff --git a/samples/client/petstore/R/R/store_api.R b/samples/client/petstore/R/R/store_api.R
index 53a8667155c..120a3fcce4b 100644
--- a/samples/client/petstore/R/R/store_api.R
+++ b/samples/client/petstore/R/R/store_api.R
@@ -249,16 +249,15 @@ StoreApi <- R6::R6Class(
     #' @return void
     #' @export
     DeleteOrder = function(order_id, ...) {
-      api_response <- self$DeleteOrderWithHttpInfo(order_id, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$DeleteOrderWithHttpInfo(order_id, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Delete purchase order by ID
@@ -304,26 +303,27 @@ StoreApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -342,16 +342,15 @@ StoreApi <- R6::R6Class(
     #' @return map(integer)
     #' @export
     GetInventory = function(data_file = NULL, ...) {
-      api_response <- self$GetInventoryWithHttpInfo(data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$GetInventoryWithHttpInfo(data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Returns pet inventories by status
@@ -390,39 +389,40 @@ StoreApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "map(integer)", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "map(integer)", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -442,16 +442,15 @@ StoreApi <- R6::R6Class(
     #' @return Order
     #' @export
     GetOrderById = function(order_id, data_file = NULL, ...) {
-      api_response <- self$GetOrderByIdWithHttpInfo(order_id, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$GetOrderByIdWithHttpInfo(order_id, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Find purchase order by ID
@@ -498,39 +497,40 @@ StoreApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "Order", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "Order", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -550,16 +550,15 @@ StoreApi <- R6::R6Class(
     #' @return Order
     #' @export
     PlaceOrder = function(order, data_file = NULL, ...) {
-      api_response <- self$PlaceOrderWithHttpInfo(order, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$PlaceOrderWithHttpInfo(order, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Place an order for a pet
@@ -607,39 +606,40 @@ StoreApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "Order", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "Order", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
diff --git a/samples/client/petstore/R/R/user_api.R b/samples/client/petstore/R/R/user_api.R
index 81bc3c10db9..8178f2c7bf6 100644
--- a/samples/client/petstore/R/R/user_api.R
+++ b/samples/client/petstore/R/R/user_api.R
@@ -435,16 +435,15 @@ UserApi <- R6::R6Class(
     #' @return void
     #' @export
     CreateUser = function(user, ...) {
-      api_response <- self$CreateUserWithHttpInfo(user, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$CreateUserWithHttpInfo(user, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Create user
@@ -495,26 +494,27 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -533,16 +533,15 @@ UserApi <- R6::R6Class(
     #' @return void
     #' @export
     CreateUsersWithArrayInput = function(user, ...) {
-      api_response <- self$CreateUsersWithArrayInputWithHttpInfo(user, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$CreateUsersWithArrayInputWithHttpInfo(user, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Creates list of users with given input array
@@ -596,26 +595,27 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -634,16 +634,15 @@ UserApi <- R6::R6Class(
     #' @return void
     #' @export
     CreateUsersWithListInput = function(user, ...) {
-      api_response <- self$CreateUsersWithListInputWithHttpInfo(user, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$CreateUsersWithListInputWithHttpInfo(user, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Creates list of users with given input array
@@ -697,26 +696,27 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -735,16 +735,15 @@ UserApi <- R6::R6Class(
     #' @return void
     #' @export
     DeleteUser = function(username, ...) {
-      api_response <- self$DeleteUserWithHttpInfo(username, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$DeleteUserWithHttpInfo(username, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Delete user
@@ -794,26 +793,27 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -833,16 +833,15 @@ UserApi <- R6::R6Class(
     #' @return User
     #' @export
     GetUserByName = function(username, data_file = NULL, ...) {
-      api_response <- self$GetUserByNameWithHttpInfo(username, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$GetUserByNameWithHttpInfo(username, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Get user by user name
@@ -889,39 +888,40 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "User", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "User", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -942,16 +942,15 @@ UserApi <- R6::R6Class(
     #' @return character
     #' @export
     LoginUser = function(username, password, data_file = NULL, ...) {
-      api_response <- self$LoginUserWithHttpInfo(username, password, data_file = data_file, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$LoginUserWithHttpInfo(username, password, data_file = data_file, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Logs user into the system
@@ -1006,39 +1005,40 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
         # save response in a file
         if (!is.null(data_file)) {
-            write(httr::content(local_var_resp, "text", encoding = "UTF-8", simplifyVector = FALSE), data_file)
+            write(local_var_resp$response, data_file)
         }
 
         deserialized_resp_obj <- tryCatch(
-          self$api_client$deserialize(local_var_resp, "character", loadNamespace("petstore")),
+          self$api_client$deserialize(local_var_resp$response, "character", loadNamespace("petstore")),
           error = function(e) {
              rlang::abort(message = "Failed to deserialize response",
                           .subclass = "ApiException",
                           ApiException = ApiException$new(http_response = local_var_resp))
           }
         )
-        ApiResponse$new(deserialized_resp_obj, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+        local_var_resp$content <- deserialized_resp_obj
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -1056,16 +1056,15 @@ UserApi <- R6::R6Class(
     #' @return void
     #' @export
     LogoutUser = function(...) {
-      api_response <- self$LogoutUserWithHttpInfo(...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$LogoutUserWithHttpInfo(...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Logs out current logged in user session
@@ -1103,26 +1102,27 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }
@@ -1142,16 +1142,15 @@ UserApi <- R6::R6Class(
     #' @return void
     #' @export
     UpdateUser = function(username, user, ...) {
-      api_response <- self$UpdateUserWithHttpInfo(username, user, ...)
-      local_var_response <- api_response$response
-      if (httr::status_code(local_var_response) >= 200 && httr::status_code(local_var_response) <= 299) {
-        api_response$content
-      } else if (httr::status_code(local_var_response) >= 300 && httr::status_code(local_var_response) <= 399) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 400 && httr::status_code(local_var_response) <= 499) {
-        api_response
-      } else if (httr::status_code(local_var_response) >= 500 && httr::status_code(local_var_response) <= 599) {
-        api_response
+      local_var_response <- self$UpdateUserWithHttpInfo(username, user, ...)
+      if (local_var_response$status_code >= 200 && local_var_response$status_code <= 299) {
+        local_var_response$content
+      } else if (local_var_response$status_code >= 300 && local_var_response$status_code <= 399) {
+        local_var_response
+      } else if (local_var_response$status_code >= 400 && local_var_response$status_code <= 499) {
+        local_var_response
+      } else if (local_var_response$status_code >= 500 && local_var_response$status_code <= 599) {
+        local_var_response
       }
     },
     #' Updated user
@@ -1214,26 +1213,27 @@ UserApi <- R6::R6Class(
                                  body = local_var_body,
                                  ...)
 
-      if (httr::status_code(local_var_resp) >= 200 && httr::status_code(local_var_resp) <= 299) {
-        ApiResponse$new(NULL, local_var_resp)
-      } else if (httr::status_code(local_var_resp) >= 300 && httr::status_code(local_var_resp) <= 399) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      if (local_var_resp$status_code >= 200 && local_var_resp$status_code <= 299) {
+        local_var_resp$content <- NULL
+        local_var_resp
+      } else if (local_var_resp$status_code >= 300 && local_var_resp$status_code <= 399) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
-          local_var_error_msg <- paste("Server returned ", httr::status_code(local_var_resp), " response status code.")
+          local_var_error_msg <- paste("Server returned ", local_var_resp$status_code, " response status code.")
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 400 && httr::status_code(local_var_resp) <= 499) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 400 && local_var_resp$status_code <= 499) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api client exception encountered."
         }
         rlang::abort(message = local_var_error_msg,
                      .subclass = "ApiException",
                      ApiException = ApiException$new(http_response = local_var_resp))
-      } else if (httr::status_code(local_var_resp) >= 500 && httr::status_code(local_var_resp) <= 599) {
-        local_var_error_msg <- toString(content(local_var_resp))
+      } else if (local_var_resp$status_code >= 500 && local_var_resp$status_code <= 599) {
+        local_var_error_msg <- local_var_resp$response
         if (local_var_error_msg == "") {
           local_var_error_msg <- "Api server exception encountered."
         }