diff --git a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
index 6b9d3e841bb..37bdfd8f4a7 100644
--- a/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/ApiClient-body.mustache
@@ -329,10 +329,7 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
     }
 
     // request cache
-    BOOL hasHeaderParams = false;
-    if (headerParams != nil && [headerParams count] > 0) {
-        hasHeaderParams = true;
-    }
+    BOOL hasHeaderParams = [headerParams count] > 0;
     if (offlineState) {
         {{classPrefix}}DebugLog(@"%@ cache forced", resourcePath);
         [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
@@ -353,9 +350,7 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
     }
     [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
 
-
-    // Always disable cookies!
-    [request setHTTPShouldHandleCookies:NO];
+    [self postProcessRequest:request];
 
     NSNumber* requestId = [{{classPrefix}}ApiClient queueRequest];
     if ([responseType isEqualToString:@"NSURL*"] || [responseType isEqualToString:@"NSURL"]) {
@@ -376,6 +371,12 @@ static NSString * {{classPrefix}}__fileNameForResponse(NSURLResponse *response)
     return requestId;
 }
 
+//Added for easier override to modify request
+-(void)postProcessRequest:(NSMutableURLRequest *)request {
+    // Always disable cookies!
+    [request setHTTPShouldHandleCookies:NO];
+}
+
 #pragma mark -
 
 - (NSString*) pathWithQueryParamsToString:(NSString*) path
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index b411635fe8a..6fbc67a7fae 100644
--- a/samples/client/petstore/objc/README.md
+++ b/samples/client/petstore/objc/README.md
@@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi
 
 - API version: 1.0.0
 - Package version: 
-- Build date: 2016-05-11T17:37:37.440+02:00
+- Build date: 2016-05-11T18:16:45.229+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
index a6745932320..55e84a056a4 100644
--- a/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
+++ b/samples/client/petstore/objc/SwaggerClient/SWGApiClient.m
@@ -329,10 +329,7 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
     }
 
     // request cache
-    BOOL hasHeaderParams = false;
-    if (headerParams != nil && [headerParams count] > 0) {
-        hasHeaderParams = true;
-    }
+    BOOL hasHeaderParams = [headerParams count] > 0;
     if (offlineState) {
         SWGDebugLog(@"%@ cache forced", resourcePath);
         [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
@@ -353,9 +350,7 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
     }
     [self.requestSerializer setValue:responseContentType forHTTPHeaderField:@"Accept"];
 
-
-    // Always disable cookies!
-    [request setHTTPShouldHandleCookies:NO];
+    [self postProcessRequest:request];
 
     NSNumber* requestId = [SWGApiClient queueRequest];
     if ([responseType isEqualToString:@"NSURL*"] || [responseType isEqualToString:@"NSURL"]) {
@@ -376,6 +371,12 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
     return requestId;
 }
 
+//Added for easier override to modify request
+-(void)postProcessRequest:(NSMutableURLRequest *)request {
+    // Always disable cookies!
+    [request setHTTPShouldHandleCookies:NO];
+}
+
 #pragma mark -
 
 - (NSString*) pathWithQueryParamsToString:(NSString*) path