diff --git a/generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3CrtClient.h b/generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3CrtClient.h
index 84c40db94b7..06bb1159688 100644
--- a/generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3CrtClient.h
+++ b/generated/src/aws-cpp-sdk-s3-crt/include/aws/s3-crt/S3CrtClient.h
@@ -8739,7 +8739,7 @@ class AWS_S3CRT_API S3CrtClient : public Aws::Client::AWSXMLClient,
     PutObjectResponseReceivedHandler putResponseHandler;
     CopyObjectResponseReceivedHandler copyResponseHandler;
     std::shared_ptr<const Aws::Client::AsyncCallerContext> asyncCallerContext;
-    const Aws::AmazonWebServiceRequest* originalRequest;
+    Aws::UniquePtr<Aws::AmazonWebServiceRequest> originalRequest;
     std::shared_ptr<Aws::Http::HttpRequest> request;
     std::shared_ptr<Aws::Http::HttpResponse> response;
     std::shared_ptr<Aws::Crt::Http::HttpRequest> crtHttpRequest;
@@ -8778,7 +8778,7 @@ class AWS_S3CRT_API S3CrtClient : public Aws::Client::AWSXMLClient,
   void InitCrtEndpointFromUri(aws_uri& endpoint_uri, const Aws::Http::URI& uri) const;
 
   void InitCommonCrtRequestOption(CrtRequestCallbackUserData* userData, aws_s3_meta_request_options* options,
-                                  const Aws::AmazonWebServiceRequest* request, const Aws::Http::URI& uri,
+                                  Aws::UniquePtr<Aws::AmazonWebServiceRequest> request, const Aws::Http::URI& uri,
                                   Aws::Http::HttpMethod method) const;
 
   using CopyObjectPropertiesOutcome = Aws::Utils::Outcome<Aws::Map<Aws::String, Aws::String>, S3CrtError>;
diff --git a/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp b/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp
index 5186361b14a..5464ec0959b 100644
--- a/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp
+++ b/generated/src/aws-cpp-sdk-s3-crt/source/S3CrtClient.cpp
@@ -799,7 +799,7 @@ void S3CrtClient::InitCrtEndpointFromUri(aws_uri& endpoint_uri, const Aws::Http:
 }
 
 void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData* userData, aws_s3_meta_request_options* options,
-                                             const Aws::AmazonWebServiceRequest* request, const Aws::Http::URI& uri,
+                                             Aws::UniquePtr<Aws::AmazonWebServiceRequest> request, const Aws::Http::URI& uri,
                                              Aws::Http::HttpMethod method) const {
   std::shared_ptr<HttpRequest> httpRequest(nullptr);
   if (request) {
@@ -812,7 +812,7 @@ void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData* userDat
   std::shared_ptr<HttpResponse> httpResponse = Aws::MakeShared<Aws::Http::Standard::StandardHttpResponse>(ALLOCATION_TAG, httpRequest);
 
   userData->s3CrtClient = this;
-  userData->originalRequest = request;
+  userData->originalRequest = std::move(request);
   userData->request = httpRequest;
   userData->response = httpResponse;
 
@@ -1000,7 +1000,7 @@ static void CopyObjectRequestShutdownCallback(void* user_data) {
       userData->asyncCallerContext->GetMonitorContext().OnRequestSucceeded(userData->request, userData->response);
     }
   }
-  userData->copyResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const CopyObjectRequest*>(userData->originalRequest)),
+  userData->copyResponseHandler(userData->s3CrtClient, *(static_cast<const CopyObjectRequest*>(userData->originalRequest.get())),
                                 std::move(outcome), userData->asyncCallerContext);
 
   Aws::Delete(userData);
@@ -1071,7 +1071,8 @@ void S3CrtClient::CopyObjectAsync(const CopyObjectRequest& request, const CopyOb
   if (handlerContext) {
     userData->asyncCallerContext = handlerContext;
   }
-  InitCommonCrtRequestOption(userData, &options, &request, endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_PUT);
+  auto requestCopy = Aws::MakeUnique<CopyObjectRequest>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_PUT);
   if (userData != nullptr && userData->request != nullptr && userData->request->GetContentBody() != nullptr &&
       userData->request->GetContentBody()->fail()) {
     return handler(this, request,
@@ -1245,7 +1246,7 @@ static void GetObjectRequestShutdownCallback(void* user_data) {
       userData->asyncCallerContext->GetMonitorContext().OnRequestSucceeded(userData->request, userData->response);
     }
   }
-  userData->getResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const GetObjectRequest*>(userData->originalRequest)),
+  userData->getResponseHandler(userData->s3CrtClient, *(static_cast<const GetObjectRequest*>(userData->originalRequest.get())),
                                std::move(outcome), userData->asyncCallerContext);
 
   Aws::Delete(userData);
@@ -1309,7 +1310,8 @@ void S3CrtClient::GetObjectAsync(const GetObjectRequest& request, const GetObjec
   if (handlerContext) {
     userData->asyncCallerContext = handlerContext;
   }
-  InitCommonCrtRequestOption(userData, &options, &request, endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_GET);
+  auto requestCopy = Aws::MakeUnique<GetObjectRequest>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_GET);
   if (userData != nullptr && userData->request != nullptr && userData->request->GetContentBody() != nullptr &&
       userData->request->GetContentBody()->fail()) {
     return handler(this, request,
@@ -1406,7 +1408,7 @@ static void PutObjectRequestShutdownCallback(void* user_data) {
       userData->asyncCallerContext->GetMonitorContext().OnRequestSucceeded(userData->request, userData->response);
     }
   }
-  userData->putResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const PutObjectRequest*>(userData->originalRequest)),
+  userData->putResponseHandler(userData->s3CrtClient, *(static_cast<const PutObjectRequest*>(userData->originalRequest.get())),
                                std::move(outcome), userData->asyncCallerContext);
 
   Aws::Delete(userData);
@@ -1470,7 +1472,8 @@ void S3CrtClient::PutObjectAsync(const PutObjectRequest& request, const PutObjec
   if (handlerContext) {
     userData->asyncCallerContext = handlerContext;
   }
-  InitCommonCrtRequestOption(userData, &options, &request, endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_PUT);
+  auto requestCopy = Aws::MakeUnique<PutObjectRequest>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_PUT);
   if (userData != nullptr && userData->request != nullptr && userData->request->GetContentBody() != nullptr &&
       userData->request->GetContentBody()->fail()) {
     return handler(this, request,
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientHeader.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientHeader.vm
index a8b82fbf9a9..2a382b08b8b 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientHeader.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/S3ClientHeader.vm
@@ -214,7 +214,7 @@ namespace ${rootNamespace}
           PutObjectResponseReceivedHandler putResponseHandler;
           CopyObjectResponseReceivedHandler copyResponseHandler;
           std::shared_ptr<const Aws::Client::AsyncCallerContext> asyncCallerContext;
-          const Aws::AmazonWebServiceRequest *originalRequest;
+          Aws::UniquePtr<Aws::AmazonWebServiceRequest> originalRequest;
           std::shared_ptr<Aws::Http::HttpRequest> request;
           std::shared_ptr<Aws::Http::HttpResponse> response;
           std::shared_ptr<Aws::Crt::Http::HttpRequest> crtHttpRequest;
@@ -252,7 +252,7 @@ namespace ${rootNamespace}
 
         void InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
                                         aws_s3_meta_request_options *options,
-                                        const Aws::AmazonWebServiceRequest *request,
+                                        Aws::UniquePtr<Aws::AmazonWebServiceRequest> request,
                                         const Aws::Http::URI &uri, Aws::Http::HttpMethod method) const;
 
         using CopyObjectPropertiesOutcome = Aws::Utils::Outcome<Aws::Map<Aws::String, Aws::String>, S3CrtError>;
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/SmithyS3ClientHeader.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/SmithyS3ClientHeader.vm
index 7f00421a0e6..a3e88f4f52f 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/SmithyS3ClientHeader.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/SmithyS3ClientHeader.vm
@@ -230,7 +230,7 @@ namespace ${rootNamespace}
           PutObjectResponseReceivedHandler putResponseHandler;
           CopyObjectResponseReceivedHandler copyResponseHandler;
           std::shared_ptr<const Aws::Client::AsyncCallerContext> asyncCallerContext;
-          const Aws::AmazonWebServiceRequest *originalRequest;
+          Aws::UniquePtr<Aws::AmazonWebServiceRequest> originalRequest;
           std::shared_ptr<Aws::Http::HttpRequest> request;
           std::shared_ptr<Aws::Http::HttpResponse> response;
           std::shared_ptr<Aws::Crt::Http::HttpRequest> crtHttpRequest;
@@ -264,7 +264,7 @@ namespace ${rootNamespace}
 
         void InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
                                         aws_s3_meta_request_options *options,
-                                        const Aws::AmazonWebServiceRequest *request,
+                                        Aws::UniquePtr<Aws::AmazonWebServiceRequest> request,
                                         const Aws::Http::URI &uri, Aws::Http::HttpMethod method) const;
 
         using CopyObjectPropertiesOutcome = Aws::Utils::Outcome<Aws::Map<Aws::String, Aws::String>, S3CrtError>;
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm
index 0d32c1a76e7..70d35a6391a 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/S3CrtSpecificOperations.vm
@@ -277,7 +277,7 @@ void S3CrtClient::InitCrtEndpointFromUri(aws_uri &endpoint_uri, const Aws::Http:
 
 void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
                                              aws_s3_meta_request_options *options,
-                                             const Aws::AmazonWebServiceRequest *request,
+                                             Aws::UniquePtr<Aws::AmazonWebServiceRequest> request,
                                              const Aws::Http::URI &uri,
                                              Aws::Http::HttpMethod method) const
 {
@@ -295,7 +295,7 @@ void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userDat
   std::shared_ptr<HttpResponse> httpResponse = Aws::MakeShared<Aws::Http::Standard::StandardHttpResponse>(ALLOCATION_TAG, httpRequest);
 
   userData->s3CrtClient = this;
-  userData->originalRequest = request;
+  userData->originalRequest = std::move(request);
   userData->request = httpRequest;
   userData->response = httpResponse;
 
@@ -512,11 +512,11 @@ static void ${operation.name}RequestShutdownCallback(void *user_data)
   }
 #if($operation.request)
 #if($operation.name == "PutObject")
-  userData->putResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const ${operation.request.shape.name}*>(userData->originalRequest)), std::move(outcome), userData->asyncCallerContext);
+  userData->putResponseHandler(userData->s3CrtClient, *(static_cast<const ${operation.request.shape.name}*>(userData->originalRequest.get())), std::move(outcome), userData->asyncCallerContext);
 #elseif($operation.name == "GetObject")
-  userData->getResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const ${operation.request.shape.name}*>(userData->originalRequest)), std::move(outcome), userData->asyncCallerContext);
+  userData->getResponseHandler(userData->s3CrtClient, *(static_cast<const ${operation.request.shape.name}*>(userData->originalRequest.get())), std::move(outcome), userData->asyncCallerContext);
 #elseif($operation.name == "CopyObject")
-  userData->copyResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const ${operation.request.shape.name}*>(userData->originalRequest)), std::move(outcome), userData->asyncCallerContext);
+  userData->copyResponseHandler(userData->s3CrtClient, *(static_cast<const ${operation.request.shape.name}*>(userData->originalRequest.get())), std::move(outcome), userData->asyncCallerContext);
 #end
 #else
   (*handler)(userData->s3CrtClient, outcome, userData->userCallbackContext);
@@ -594,7 +594,8 @@ void ${className}::${operation.name}Async(${constText}${operation.request.shape.
     userData->asyncCallerContext = handlerContext;
   }
 #if($serviceModel.endpointRules)
-  InitCommonCrtRequestOption(userData, &options, &request, endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_${operation.http.method});
+  auto requestCopy = Aws::MakeUnique<${operation.request.shape.name}>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_${operation.http.method});
   if (userData != nullptr &&
     userData->request != nullptr &&
     userData->request->GetContentBody() != nullptr &&
@@ -609,7 +610,8 @@ void ${className}::${operation.name}Async(${constText}${operation.request.shape.
 #end
   }
 #else
-  InitCommonCrtRequestOption(userData, &options, &request, uri, Aws::Http::HttpMethod::HTTP_${operation.http.method});
+  auto requestCopy = Aws::MakeUnique<${operation.request.shape.name}>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), uri, Aws::Http::HttpMethod::HTTP_${operation.http.method});
 #end
 #if($operation.name == "CopyObject")
   {
diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm
index c912bde856b..3d802ae1497 100644
--- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm
+++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/s3-crt/SmithyS3CrtSpecificOperations.vm
@@ -277,7 +277,7 @@ void S3CrtClient::InitCrtEndpointFromUri(aws_uri &endpoint_uri, const Aws::Http:
 
 void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userData,
                                              aws_s3_meta_request_options *options,
-                                             const Aws::AmazonWebServiceRequest *request,
+                                             Aws::UniquePtr<Aws::AmazonWebServiceRequest> request,
                                              const Aws::Http::URI &uri,
                                              Aws::Http::HttpMethod method) const
 {
@@ -286,7 +286,7 @@ void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userDat
   std::shared_ptr<smithy::client::AwsSmithyClientAsyncRequestContext> pRequestCtx =
         Aws::MakeShared<smithy::client::AwsSmithyClientAsyncRequestContext>(ALLOCATION_TAG);
   assert(pRequestCtx);
-  pRequestCtx->m_pRequest = request;
+  pRequestCtx->m_pRequest = request.get();
   pRequestCtx->m_invocationId = Aws::Utils::UUID::PseudoRandomUUID();
   pRequestCtx->m_requestInfo.attempt = 1;
   pRequestCtx->m_requestInfo.maxAttempts = 0;
@@ -295,7 +295,7 @@ void S3CrtClient::InitCommonCrtRequestOption(CrtRequestCallbackUserData *userDat
   std::shared_ptr<HttpResponse> httpResponse = Aws::MakeShared<Aws::Http::Standard::StandardHttpResponse>(ALLOCATION_TAG, httpRequest);
 
   userData->s3CrtClient = this;
-  userData->originalRequest = request;
+  userData->originalRequest = std::move(request);
   userData->request = httpRequest;
   userData->response = httpResponse;
 
@@ -512,11 +512,11 @@ static void ${operation.name}RequestShutdownCallback(void *user_data)
   }
 #if($operation.request)
 #if($operation.name == "PutObject")
-  userData->putResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const ${operation.request.shape.name}*>(userData->originalRequest)), std::move(outcome), userData->asyncCallerContext);
+  userData->putResponseHandler(userData->s3CrtClient, *(static_cast<const ${operation.request.shape.name}*>(userData->originalRequest.get())), std::move(outcome), userData->asyncCallerContext);
 #elseif($operation.name == "GetObject")
-  userData->getResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const ${operation.request.shape.name}*>(userData->originalRequest)), std::move(outcome), userData->asyncCallerContext);
+  userData->getResponseHandler(userData->s3CrtClient, *(static_cast<const ${operation.request.shape.name}*>(userData->originalRequest.get())), std::move(outcome), userData->asyncCallerContext);
 #elseif($operation.name == "CopyObject")
-  userData->copyResponseHandler(userData->s3CrtClient, *(reinterpret_cast<const ${operation.request.shape.name}*>(userData->originalRequest)), std::move(outcome), userData->asyncCallerContext);
+  userData->copyResponseHandler(userData->s3CrtClient, *(static_cast<const ${operation.request.shape.name}*>(userData->originalRequest.get())), std::move(outcome), userData->asyncCallerContext);
 #end
 #else
   (*handler)(userData->s3CrtClient, outcome, userData->userCallbackContext);
@@ -612,7 +612,8 @@ void ${className}::${operation.name}Async(${constText}${operation.request.shape.
     userData->asyncCallerContext = handlerContext;
   }
 #if($serviceModel.endpointRules)
-  InitCommonCrtRequestOption(userData, &options, &request, endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_${operation.http.method});
+  auto requestCopy = Aws::MakeUnique<${operation.request.shape.name}>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), endpointResolutionOutcome.GetResult().GetURI(), Aws::Http::HttpMethod::HTTP_${operation.http.method});
   if (userData != nullptr &&
     userData->request != nullptr &&
     userData->request->GetContentBody() != nullptr &&
@@ -627,7 +628,8 @@ void ${className}::${operation.name}Async(${constText}${operation.request.shape.
 #end
   }
 #else
-  InitCommonCrtRequestOption(userData, &options, &request, uri, Aws::Http::HttpMethod::HTTP_${operation.http.method});
+  auto requestCopy = Aws::MakeUnique<${operation.request.shape.name}>(ALLOCATION_TAG, request);
+  InitCommonCrtRequestOption(userData, &options, std::move(requestCopy), uri, Aws::Http::HttpMethod::HTTP_${operation.http.method});
 #end
 #if($operation.name == "CopyObject")
   {