diff --git a/.codegen.json b/.codegen.json
index b2646025..b3723af9 100644
--- a/.codegen.json
+++ b/.codegen.json
@@ -1 +1 @@
-{ "engineHash": "264bdc9", "specHash": "6886603", "version": "1.8.0" }
+{ "engineHash": "ce7ab17", "specHash": "6886603", "version": "1.8.0" }
diff --git a/README.md b/README.md
index fc23a044..f3066265 100644
--- a/README.md
+++ b/README.md
@@ -28,13 +28,15 @@ Embrace the new generation of Box SDKs and unlock the full potential of the Box
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
+- [Box Python SDK GENERATED](#box-python-sdk-generated)
+- [Table of contents](#table-of-contents)
 - [Installing](#installing)
 - [Getting Started](#getting-started)
 - [Documentation](#documentation)
 - [Upgrades](#upgrades)
 - [Integration Tests](#integration-tests)
   - [Running integration tests locally](#running-integration-tests-locally)
-    - [Create Custom Application](#create-custom-application)
+    - [Create Platform Application](#create-platform-application)
     - [Export configuration](#export-configuration)
     - [Running tests](#running-tests)
 - [Questions, Bugs, and Feature Requests?](#questions-bugs-and-feature-requests)
@@ -93,7 +95,7 @@ Upgrading from our legacy SDKs to the new generation SDKs is a straightforward p
 
 ## Running integration tests locally
 
-### Create Custom Application
+### Create Platform Application
 
 To run integration tests locally you will need a `Custom App` created in the [Box Developer
 Console](https://app.box.com/developers/console)
diff --git a/box_sdk_gen/box/oauth.py b/box_sdk_gen/box/oauth.py
index 08eddcd1..a0853f0d 100644
--- a/box_sdk_gen/box/oauth.py
+++ b/box_sdk_gen/box/oauth.py
@@ -161,7 +161,7 @@ def refresh_token(
         self, *, network_session: Optional[NetworkSession] = None
     ) -> AccessToken:
         """
-        Get a new access token for the app user.
+        Get a new access token for the platform app user.
         :param network_session: An object to keep network session state, defaults to None
         :type network_session: Optional[NetworkSession], optional
         """
diff --git a/box_sdk_gen/client.py b/box_sdk_gen/client.py
index f09d8041..8d05989b 100644
--- a/box_sdk_gen/client.py
+++ b/box_sdk_gen/client.py
@@ -168,15 +168,15 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
-from box_sdk_gen.networking.base_urls import BaseUrls
-
-from box_sdk_gen.networking.proxy_config import ProxyConfig
+from box_sdk_gen.box.errors import BoxSDKError
 
 from box_sdk_gen.networking.fetch_options import FetchOptions
 
 from box_sdk_gen.networking.fetch_response import FetchResponse
 
-from box_sdk_gen.networking.fetch import fetch
+from box_sdk_gen.networking.base_urls import BaseUrls
+
+from box_sdk_gen.networking.proxy_config import ProxyConfig
 
 
 class BoxClient:
@@ -426,7 +426,7 @@ def make_request(self, fetch_options: FetchOptions) -> FetchResponse:
             response_format=fetch_options.response_format,
             follow_redirects=fetch_options.follow_redirects,
         )
-        return fetch(enriched_fetch_options)
+        return network_session.network_client.fetch(enriched_fetch_options)
 
     def with_as_user_header(self, user_id: str) -> 'BoxClient':
         """
diff --git a/box_sdk_gen/managers/ai.py b/box_sdk_gen/managers/ai.py
index 16cccb1b..c82f200f 100644
--- a/box_sdk_gen/managers/ai.py
+++ b/box_sdk_gen/managers/ai.py
@@ -28,8 +28,6 @@
 
 from box_sdk_gen.schemas.ai_ask import AiAsk
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.ai_response import AiResponse
 
 from box_sdk_gen.schemas.ai_text_gen import AiTextGen
@@ -48,22 +46,22 @@
 
 from box_sdk_gen.schemas.ai_extract_structured import AiExtractStructured
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.serialization.json import sd_to_json
@@ -251,7 +249,7 @@ def create_ai_ask(
             'ai_agent': ai_agent,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/ai/ask']),
                 method='POST',
@@ -298,7 +296,7 @@ def create_ai_text_gen(
             'ai_agent': ai_agent,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/ai/text_gen']
@@ -344,7 +342,7 @@ def get_ai_agent_default_config(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/ai_agent_default']
@@ -389,7 +387,7 @@ def create_ai_extract(
             extra_headers = {}
         request_body: Dict = {'prompt': prompt, 'items': items, 'ai_agent': ai_agent}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/ai/extract']
@@ -448,7 +446,7 @@ def create_ai_extract_structured(
             'ai_agent': ai_agent,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/app_item_associations.py b/box_sdk_gen/managers/app_item_associations.py
index 1172023f..183d106b 100644
--- a/box_sdk_gen/managers/app_item_associations.py
+++ b/box_sdk_gen/managers/app_item_associations.py
@@ -18,6 +18,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -26,12 +30,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -101,7 +99,7 @@ def get_file_app_item_associations(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -178,7 +176,7 @@ def get_folder_app_item_associations(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/authorization.py b/box_sdk_gen/managers/authorization.py
index b36bbc55..a2d385be 100644
--- a/box_sdk_gen/managers/authorization.py
+++ b/box_sdk_gen/managers/authorization.py
@@ -18,8 +18,6 @@
 
 from box_sdk_gen.networking.fetch_options import ResponseFormat
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.access_token import AccessToken
 
 from box_sdk_gen.schemas.o_auth_2_error import OAuth2Error
@@ -32,10 +30,16 @@
 
 from box_sdk_gen.schemas.post_o_auth_2_revoke import PostOAuth2Revoke
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -44,12 +48,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -172,7 +170,7 @@ def authorize_user(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.oauth_2_url, '/authorize']),
                 method='GET',
@@ -326,7 +324,7 @@ def request_access_token(
             'box_shared_link': box_shared_link,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/oauth2/token']),
                 method='POST',
@@ -371,7 +369,7 @@ def refresh_access_token(
             'refresh_token': refresh_token,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/oauth2/token#refresh']
@@ -419,7 +417,7 @@ def revoke_access_token(
             'token': token,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/oauth2/revoke']
diff --git a/box_sdk_gen/managers/avatars.py b/box_sdk_gen/managers/avatars.py
index b4fc31f4..566dcbe6 100644
--- a/box_sdk_gen/managers/avatars.py
+++ b/box_sdk_gen/managers/avatars.py
@@ -10,26 +10,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.user_avatar import UserAvatar
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.networking.fetch_options import MultipartItem
@@ -63,7 +61,7 @@ def get_user_avatar(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -111,7 +109,7 @@ def create_user_avatar(
             'pic_content_type': pic_content_type,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -156,7 +154,7 @@ def delete_user_avatar(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/chunked_uploads.py b/box_sdk_gen/managers/chunked_uploads.py
index 6a55b7d8..ab2a6d33 100644
--- a/box_sdk_gen/managers/chunked_uploads.py
+++ b/box_sdk_gen/managers/chunked_uploads.py
@@ -24,8 +24,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.uploaded_part import UploadedPart
 
 from box_sdk_gen.schemas.upload_parts import UploadParts
@@ -34,22 +32,22 @@
 
 from box_sdk_gen.schemas.upload_part import UploadPart
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.serialization.json import sd_to_json
@@ -124,7 +122,7 @@ def create_file_upload_session(
             'file_name': file_name,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -173,7 +171,7 @@ def create_file_upload_session_for_existing_file(
             extra_headers = {}
         request_body: Dict = {'file_size': file_size, 'file_name': file_name}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -216,7 +214,7 @@ def get_file_upload_session_by_url(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=url,
                 method='GET',
@@ -248,7 +246,7 @@ def get_file_upload_session_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -331,7 +329,7 @@ def upload_file_part_by_url(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=url,
                 method='PUT',
@@ -405,7 +403,7 @@ def upload_file_part(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -453,7 +451,7 @@ def delete_file_upload_session_by_url(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=url,
                 method='DELETE',
@@ -491,7 +489,7 @@ def delete_file_upload_session_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -550,7 +548,7 @@ def get_file_upload_session_parts_by_url(
             {'offset': to_string(offset), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=url,
                 method='GET',
@@ -599,7 +597,7 @@ def get_file_upload_session_parts(
             {'offset': to_string(offset), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -684,7 +682,7 @@ def create_file_upload_session_commit_by_url(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=url,
                 method='POST',
@@ -760,7 +758,7 @@ def create_file_upload_session_commit(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/classifications.py b/box_sdk_gen/managers/classifications.py
index 62fa56d0..95a33f40 100644
--- a/box_sdk_gen/managers/classifications.py
+++ b/box_sdk_gen/managers/classifications.py
@@ -24,18 +24,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -515,7 +513,7 @@ def get_classification_template(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -560,7 +558,7 @@ def add_classification(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -607,7 +605,7 @@ def update_classification(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -689,7 +687,7 @@ def create_classification_template(
             'fields': fields,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/collaboration_allowlist_entries.py b/box_sdk_gen/managers/collaboration_allowlist_entries.py
index 94e93d12..15176d4f 100644
--- a/box_sdk_gen/managers/collaboration_allowlist_entries.py
+++ b/box_sdk_gen/managers/collaboration_allowlist_entries.py
@@ -18,16 +18,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.collaboration_allowlist_entry import (
     CollaborationAllowlistEntry,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -91,7 +89,7 @@ def get_collaboration_whitelist_entries(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -132,7 +130,7 @@ def create_collaboration_whitelist_entry(
             extra_headers = {}
         request_body: Dict = {'domain': domain, 'direction': direction}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -171,7 +169,7 @@ def get_collaboration_whitelist_entry_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -209,7 +207,7 @@ def delete_collaboration_whitelist_entry_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/collaboration_allowlist_exempt_targets.py b/box_sdk_gen/managers/collaboration_allowlist_exempt_targets.py
index db1d6d21..aaacce06 100644
--- a/box_sdk_gen/managers/collaboration_allowlist_exempt_targets.py
+++ b/box_sdk_gen/managers/collaboration_allowlist_exempt_targets.py
@@ -18,16 +18,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.collaboration_allowlist_exempt_target import (
     CollaborationAllowlistExemptTarget,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -95,7 +93,7 @@ def get_collaboration_whitelist_exempt_targets(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -133,7 +131,7 @@ def create_collaboration_whitelist_exempt_target(
             extra_headers = {}
         request_body: Dict = {'user': user}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -172,7 +170,7 @@ def get_collaboration_whitelist_exempt_target_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -210,7 +208,7 @@ def delete_collaboration_whitelist_exempt_target_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/collections.py b/box_sdk_gen/managers/collections.py
index 993e33b0..bb060a8d 100644
--- a/box_sdk_gen/managers/collections.py
+++ b/box_sdk_gen/managers/collections.py
@@ -14,16 +14,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.items_offset_paginated import ItemsOffsetPaginated
 
 from box_sdk_gen.schemas.collection import Collection
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -32,12 +36,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -100,7 +98,7 @@ def get_collections(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/collections']
@@ -163,7 +161,7 @@ def get_collection_items(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -200,7 +198,7 @@ def get_collection_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/comments.py b/box_sdk_gen/managers/comments.py
index 106a7b53..a76eb4f8 100644
--- a/box_sdk_gen/managers/comments.py
+++ b/box_sdk_gen/managers/comments.py
@@ -20,14 +20,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.comment_full import CommentFull
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -128,7 +126,7 @@ def get_file_comments(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -180,7 +178,7 @@ def get_comment_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -232,7 +230,7 @@ def update_comment_by_id(
         request_body: Dict = {'message': message}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -270,7 +268,7 @@ def delete_comment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -343,7 +341,7 @@ def create_comment(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/comments']),
                 method='POST',
diff --git a/box_sdk_gen/managers/device_pinners.py b/box_sdk_gen/managers/device_pinners.py
index e95fe1b3..f7e63900 100644
--- a/box_sdk_gen/managers/device_pinners.py
+++ b/box_sdk_gen/managers/device_pinners.py
@@ -14,26 +14,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.device_pinners import DevicePinners
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -73,7 +71,7 @@ def get_device_pinner_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -108,7 +106,7 @@ def delete_device_pinner_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -169,7 +167,7 @@ def get_enterprise_device_pinners(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/downloads.py b/box_sdk_gen/managers/downloads.py
index 842fe8d0..040090fb 100644
--- a/box_sdk_gen/managers/downloads.py
+++ b/box_sdk_gen/managers/downloads.py
@@ -14,6 +14,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -22,12 +26,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.internal.utils import write_input_stream_to_output_stream
 
 from box_sdk_gen.internal.utils import OutputStream
@@ -98,7 +96,7 @@ def get_download_file_url(
         headers_map: Dict[str, str] = prepare_params(
             {'range': to_string(range), 'boxapi': to_string(boxapi), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -174,7 +172,7 @@ def download_file(
         headers_map: Dict[str, str] = prepare_params(
             {'range': to_string(range), 'boxapi': to_string(boxapi), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/email_aliases.py b/box_sdk_gen/managers/email_aliases.py
index 00aa475e..6d837b11 100644
--- a/box_sdk_gen/managers/email_aliases.py
+++ b/box_sdk_gen/managers/email_aliases.py
@@ -14,26 +14,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.email_alias import EmailAlias
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -68,7 +66,7 @@ def get_user_email_aliases(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -114,7 +112,7 @@ def create_user_email_alias(
             extra_headers = {}
         request_body: Dict = {'email': email}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -156,7 +154,7 @@ def delete_user_email_alias_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/events.py b/box_sdk_gen/managers/events.py
index 5e6caac9..64198ccd 100644
--- a/box_sdk_gen/managers/events.py
+++ b/box_sdk_gen/managers/events.py
@@ -16,26 +16,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.events import Events
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -278,7 +276,7 @@ def get_events_with_long_polling(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/events']),
                 method='OPTIONS',
@@ -387,7 +385,7 @@ def get_events(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/events']),
                 method='GET',
diff --git a/box_sdk_gen/managers/file_classifications.py b/box_sdk_gen/managers/file_classifications.py
index 515f93ff..e042159b 100644
--- a/box_sdk_gen/managers/file_classifications.py
+++ b/box_sdk_gen/managers/file_classifications.py
@@ -26,18 +26,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -124,7 +122,7 @@ def get_classification_on_file(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -189,7 +187,7 @@ def add_classification_to_file(
             'Box__Security__Classification__Key': box_security_classification_key
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -245,7 +243,7 @@ def update_classification_on_file(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -295,7 +293,7 @@ def delete_classification_from_file(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/file_metadata.py b/box_sdk_gen/managers/file_metadata.py
index 1b386b46..06ccb90f 100644
--- a/box_sdk_gen/managers/file_metadata.py
+++ b/box_sdk_gen/managers/file_metadata.py
@@ -20,26 +20,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.metadata_full import MetadataFull
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -159,7 +157,7 @@ def get_file_metadata(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -212,7 +210,7 @@ def get_file_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -277,7 +275,7 @@ def create_file_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -350,7 +348,7 @@ def update_file_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -405,7 +403,7 @@ def delete_file_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/file_requests.py b/box_sdk_gen/managers/file_requests.py
index a7076cc5..cbf6a1f2 100644
--- a/box_sdk_gen/managers/file_requests.py
+++ b/box_sdk_gen/managers/file_requests.py
@@ -20,28 +20,26 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.file_request_update_request import FileRequestUpdateRequest
 
 from box_sdk_gen.schemas.file_request_copy_request import FileRequestCopyRequest
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -118,7 +116,7 @@ def get_file_request_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -230,7 +228,7 @@ def update_file_request_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'if-match': to_string(if_match), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -273,7 +271,7 @@ def delete_file_request_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -378,7 +376,7 @@ def create_file_request_copy(
             'expires_at': expires_at,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/file_version_legal_holds.py b/box_sdk_gen/managers/file_version_legal_holds.py
index 83eda8fe..df236e3d 100644
--- a/box_sdk_gen/managers/file_version_legal_holds.py
+++ b/box_sdk_gen/managers/file_version_legal_holds.py
@@ -12,26 +12,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.file_version_legal_holds import FileVersionLegalHolds
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -69,7 +67,7 @@ def get_file_version_legal_hold_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -162,7 +160,7 @@ def get_file_version_legal_holds(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/file_version_retentions.py b/box_sdk_gen/managers/file_version_retentions.py
index 588d243f..def652ca 100644
--- a/box_sdk_gen/managers/file_version_retentions.py
+++ b/box_sdk_gen/managers/file_version_retentions.py
@@ -14,14 +14,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.file_version_retention import FileVersionRetention
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -30,12 +34,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -123,7 +121,7 @@ def get_file_version_retentions(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -170,7 +168,7 @@ def get_file_version_retention_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/file_versions.py b/box_sdk_gen/managers/file_versions.py
index 825a4879..d085c4ce 100644
--- a/box_sdk_gen/managers/file_versions.py
+++ b/box_sdk_gen/managers/file_versions.py
@@ -22,14 +22,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.file_version_full import FileVersionFull
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -120,7 +118,7 @@ def get_file_versions(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -182,7 +180,7 @@ def get_file_version_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -244,7 +242,7 @@ def delete_file_version_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'if-match': to_string(if_match), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -305,7 +303,7 @@ def update_file_version_by_id(
             extra_headers = {}
         request_body: Dict = {'trashed_at': trashed_at}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -402,7 +400,7 @@ def promote_file_version(
         request_body: Dict = {'id': id, 'type': type}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/file_watermarks.py b/box_sdk_gen/managers/file_watermarks.py
index 2fb2ca83..3690c1d4 100644
--- a/box_sdk_gen/managers/file_watermarks.py
+++ b/box_sdk_gen/managers/file_watermarks.py
@@ -24,18 +24,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -94,7 +92,7 @@ def get_file_watermark(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -140,7 +138,7 @@ def update_file_watermark(
             extra_headers = {}
         request_body: Dict = {'watermark': watermark}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -181,7 +179,7 @@ def delete_file_watermark(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/files.py b/box_sdk_gen/managers/files.py
index 6692fd9c..79cdf822 100644
--- a/box_sdk_gen/managers/files.py
+++ b/box_sdk_gen/managers/files.py
@@ -30,6 +30,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -322,7 +320,7 @@ def get_file_by_id(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -450,7 +448,7 @@ def update_file_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'if-match': to_string(if_match), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -514,7 +512,7 @@ def delete_file_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'if-match': to_string(if_match), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -583,7 +581,7 @@ def copy_file(
         request_body: Dict = {'name': name, 'version': version, 'parent': parent}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -670,7 +668,7 @@ def get_file_thumbnail_url(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -759,7 +757,7 @@ def get_file_thumbnail_by_id(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/folder_classifications.py b/box_sdk_gen/managers/folder_classifications.py
index d8ea889a..9f9ab4b2 100644
--- a/box_sdk_gen/managers/folder_classifications.py
+++ b/box_sdk_gen/managers/folder_classifications.py
@@ -26,18 +26,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -130,7 +128,7 @@ def get_classification_on_folder(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -198,7 +196,7 @@ def add_classification_to_folder(
             'Box__Security__Classification__Key': box_security_classification_key
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -257,7 +255,7 @@ def update_classification_on_folder(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -313,7 +311,7 @@ def delete_classification_from_folder(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/folder_locks.py b/box_sdk_gen/managers/folder_locks.py
index 2da5c2c4..c7c7e8e3 100644
--- a/box_sdk_gen/managers/folder_locks.py
+++ b/box_sdk_gen/managers/folder_locks.py
@@ -16,14 +16,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.folder_lock import FolderLock
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -32,12 +36,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -114,7 +112,7 @@ def get_folder_locks(
             {'folder_id': to_string(folder_id)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/folder_locks']
@@ -160,7 +158,7 @@ def create_folder_lock(
             extra_headers = {}
         request_body: Dict = {'locked_operations': locked_operations, 'folder': folder}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/folder_locks']
@@ -199,7 +197,7 @@ def delete_folder_lock_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/folder_metadata.py b/box_sdk_gen/managers/folder_metadata.py
index 96a6a87f..d6616aad 100644
--- a/box_sdk_gen/managers/folder_metadata.py
+++ b/box_sdk_gen/managers/folder_metadata.py
@@ -20,26 +20,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.metadata_full import MetadataFull
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -168,7 +166,7 @@ def get_folder_metadata(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -224,7 +222,7 @@ def get_folder_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -301,7 +299,7 @@ def create_folder_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -377,7 +375,7 @@ def update_folder_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -435,7 +433,7 @@ def delete_folder_metadata_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/folder_watermarks.py b/box_sdk_gen/managers/folder_watermarks.py
index bb57d542..79835001 100644
--- a/box_sdk_gen/managers/folder_watermarks.py
+++ b/box_sdk_gen/managers/folder_watermarks.py
@@ -24,18 +24,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -100,7 +98,7 @@ def get_folder_watermark(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -149,7 +147,7 @@ def update_folder_watermark(
             extra_headers = {}
         request_body: Dict = {'watermark': watermark}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -196,7 +194,7 @@ def delete_folder_watermark(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/folders.py b/box_sdk_gen/managers/folders.py
index 93f7f585..f6453249 100644
--- a/box_sdk_gen/managers/folders.py
+++ b/box_sdk_gen/managers/folders.py
@@ -24,14 +24,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.items import Items
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -40,12 +44,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -424,7 +422,7 @@ def get_folder_by_id(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -570,7 +568,7 @@ def update_folder_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'if-match': to_string(if_match), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -638,7 +636,7 @@ def delete_folder_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'if-match': to_string(if_match), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -792,7 +790,7 @@ def get_folder_items(
         headers_map: Dict[str, str] = prepare_params(
             {'boxapi': to_string(boxapi), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -863,7 +861,7 @@ def create_folder(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/folders']),
                 method='POST',
@@ -933,7 +931,7 @@ def copy_folder(
         request_body: Dict = {'name': name, 'parent': parent}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/groups.py b/box_sdk_gen/managers/groups.py
index 8c6b8ca9..eb03dcdf 100644
--- a/box_sdk_gen/managers/groups.py
+++ b/box_sdk_gen/managers/groups.py
@@ -18,14 +18,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.group_full import GroupFull
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -128,7 +126,7 @@ def get_groups(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/groups']),
                 method='GET',
@@ -229,7 +227,7 @@ def create_group(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/groups']),
                 method='POST',
@@ -279,7 +277,7 @@ def get_group_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -395,7 +393,7 @@ def update_group_by_id(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -433,7 +431,7 @@ def delete_group_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/integration_mappings.py b/box_sdk_gen/managers/integration_mappings.py
index f145b25f..8dac7e0a 100644
--- a/box_sdk_gen/managers/integration_mappings.py
+++ b/box_sdk_gen/managers/integration_mappings.py
@@ -20,8 +20,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.integration_mapping import IntegrationMapping
 
 from box_sdk_gen.schemas.integration_mapping_slack_create_request import (
@@ -36,10 +34,16 @@
     IntegrationMappingSlackOptions,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -48,12 +52,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -131,7 +129,7 @@ def get_slack_integration_mapping(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -179,7 +177,7 @@ def create_slack_integration_mapping(
             'options': options,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -227,7 +225,7 @@ def update_slack_integration_mapping_by_id(
             extra_headers = {}
         request_body: Dict = {'box_item': box_item, 'options': options}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -270,7 +268,7 @@ def delete_slack_integration_mapping_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/invites.py b/box_sdk_gen/managers/invites.py
index b4cde3b7..75f5cc71 100644
--- a/box_sdk_gen/managers/invites.py
+++ b/box_sdk_gen/managers/invites.py
@@ -24,6 +24,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -32,12 +36,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -123,7 +121,7 @@ def create_invite(
         request_body: Dict = {'enterprise': enterprise, 'actionable_by': actionable_by}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/invites']),
                 method='POST',
@@ -167,7 +165,7 @@ def get_invite_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/legal_hold_policies.py b/box_sdk_gen/managers/legal_hold_policies.py
index abddee7d..923d9e87 100644
--- a/box_sdk_gen/managers/legal_hold_policies.py
+++ b/box_sdk_gen/managers/legal_hold_policies.py
@@ -16,14 +16,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.legal_hold_policy import LegalHoldPolicy
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -32,12 +36,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -103,7 +101,7 @@ def get_legal_hold_policies(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -183,7 +181,7 @@ def create_legal_hold_policy(
             'is_ongoing': is_ongoing,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -219,7 +217,7 @@ def get_legal_hold_policy_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -268,7 +266,7 @@ def update_legal_hold_policy_by_id(
             'release_notes': release_notes,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -311,7 +309,7 @@ def delete_legal_hold_policy_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/legal_hold_policy_assignments.py b/box_sdk_gen/managers/legal_hold_policy_assignments.py
index 46c14740..aad1e235 100644
--- a/box_sdk_gen/managers/legal_hold_policy_assignments.py
+++ b/box_sdk_gen/managers/legal_hold_policy_assignments.py
@@ -20,16 +20,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.legal_hold_policy_assignment import LegalHoldPolicyAssignment
 
 from box_sdk_gen.schemas.files_on_hold import FilesOnHold
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -144,7 +142,7 @@ def get_legal_hold_policy_assignments(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -182,7 +180,7 @@ def create_legal_hold_policy_assignment(
             extra_headers = {}
         request_body: Dict = {'policy_id': policy_id, 'assign_to': assign_to}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -218,7 +216,7 @@ def get_legal_hold_policy_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -259,7 +257,7 @@ def delete_legal_hold_policy_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -363,7 +361,7 @@ def get_legal_hold_policy_assignment_file_on_hold(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/list_collaborations.py b/box_sdk_gen/managers/list_collaborations.py
index 602b49f6..a6695f15 100644
--- a/box_sdk_gen/managers/list_collaborations.py
+++ b/box_sdk_gen/managers/list_collaborations.py
@@ -16,16 +16,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.collaborations_offset_paginated import (
     CollaborationsOffsetPaginated,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -115,7 +113,7 @@ def get_file_collaborations(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -191,7 +189,7 @@ def get_folder_collaborations(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -256,7 +254,7 @@ def get_collaborations(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/collaborations']
@@ -310,7 +308,7 @@ def get_group_collaborations(
             {'limit': to_string(limit), 'offset': to_string(offset)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/memberships.py b/box_sdk_gen/managers/memberships.py
index 22a9eb1f..827c112f 100644
--- a/box_sdk_gen/managers/memberships.py
+++ b/box_sdk_gen/managers/memberships.py
@@ -24,14 +24,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.group_membership import GroupMembership
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -40,12 +44,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -127,7 +125,7 @@ def get_user_memberships(
             {'limit': to_string(limit), 'offset': to_string(offset)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -183,7 +181,7 @@ def get_group_memberships(
             {'limit': to_string(limit), 'offset': to_string(offset)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -258,7 +256,7 @@ def create_group_membership(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/group_memberships']
@@ -310,7 +308,7 @@ def get_group_membership_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -383,7 +381,7 @@ def update_group_membership_by_id(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -427,7 +425,7 @@ def delete_group_membership_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/metadata_cascade_policies.py b/box_sdk_gen/managers/metadata_cascade_policies.py
index 9e69255e..2d254c87 100644
--- a/box_sdk_gen/managers/metadata_cascade_policies.py
+++ b/box_sdk_gen/managers/metadata_cascade_policies.py
@@ -16,16 +16,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.metadata_cascade_policy import MetadataCascadePolicy
 
 from box_sdk_gen.schemas.conflict_error import ConflictError
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -114,7 +112,7 @@ def get_metadata_cascade_policies(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -188,7 +186,7 @@ def create_metadata_cascade_policy(
             'templateKey': template_key,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -224,7 +222,7 @@ def get_metadata_cascade_policy_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -259,7 +257,7 @@ def delete_metadata_cascade_policy_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -313,7 +311,7 @@ def apply_metadata_cascade_policy(
             extra_headers = {}
         request_body: Dict = {'conflict_resolution': conflict_resolution}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/metadata_templates.py b/box_sdk_gen/managers/metadata_templates.py
index e1d38b4a..e079bb35 100644
--- a/box_sdk_gen/managers/metadata_templates.py
+++ b/box_sdk_gen/managers/metadata_templates.py
@@ -20,14 +20,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.metadata_template import MetadataTemplate
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -267,7 +265,7 @@ def get_metadata_templates_by_instance_id(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/metadata_templates']
@@ -309,7 +307,7 @@ def get_metadata_template(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -366,7 +364,7 @@ def update_metadata_template(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -413,7 +411,7 @@ def delete_metadata_template(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -451,7 +449,7 @@ def get_metadata_template_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -497,7 +495,7 @@ def get_global_metadata_templates(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -543,7 +541,7 @@ def get_enterprise_metadata_templates(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -618,7 +616,7 @@ def create_metadata_template(
             'copyInstanceOnItemCopy': copy_instance_on_item_copy,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/recent_items.py b/box_sdk_gen/managers/recent_items.py
index c83975c1..83313a98 100644
--- a/box_sdk_gen/managers/recent_items.py
+++ b/box_sdk_gen/managers/recent_items.py
@@ -20,6 +20,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -28,12 +32,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -95,7 +93,7 @@ def get_recent_items(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/recent_items']
diff --git a/box_sdk_gen/managers/retention_policies.py b/box_sdk_gen/managers/retention_policies.py
index 90017d54..fe5fadf8 100644
--- a/box_sdk_gen/managers/retention_policies.py
+++ b/box_sdk_gen/managers/retention_policies.py
@@ -22,18 +22,22 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.retention_policy import RetentionPolicy
 
 from box_sdk_gen.schemas.user_mini import UserMini
 
 from box_sdk_gen.schemas.user_base import UserBase
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -42,12 +46,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -134,7 +132,7 @@ def get_retention_policies(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/retention_policies']
@@ -231,7 +229,7 @@ def create_retention_policy(
             'custom_notification_recipients': custom_notification_recipients,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/retention_policies']
@@ -276,7 +274,7 @@ def get_retention_policy_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -389,7 +387,7 @@ def update_retention_policy_by_id(
             'custom_notification_recipients': custom_notification_recipients,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -426,7 +424,7 @@ def delete_retention_policy_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/retention_policy_assignments.py b/box_sdk_gen/managers/retention_policy_assignments.py
index 14a07cd5..67b6140c 100644
--- a/box_sdk_gen/managers/retention_policy_assignments.py
+++ b/box_sdk_gen/managers/retention_policy_assignments.py
@@ -20,16 +20,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.retention_policy_assignment import RetentionPolicyAssignment
 
 from box_sdk_gen.schemas.files_under_retention import FilesUnderRetention
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -159,7 +157,7 @@ def get_retention_policy_assignments(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -218,7 +216,7 @@ def create_retention_policy_assignment(
             'start_date_field': start_date_field,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -266,7 +264,7 @@ def get_retention_policy_assignment_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -305,7 +303,7 @@ def delete_retention_policy_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -352,7 +350,7 @@ def get_files_under_retention_policy_assignment(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/search.py b/box_sdk_gen/managers/search.py
index 42b11ca3..ad8e0418 100644
--- a/box_sdk_gen/managers/search.py
+++ b/box_sdk_gen/managers/search.py
@@ -24,8 +24,6 @@
 
 from box_sdk_gen.schemas.metadata_query import MetadataQuery
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.search_results import SearchResults
 
 from box_sdk_gen.schemas.search_results_with_shared_links import (
@@ -34,22 +32,22 @@
 
 from box_sdk_gen.schemas.metadata_filter import MetadataFilter
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.serialization.json import sd_to_json
@@ -227,7 +225,7 @@ def search_by_metadata_query(
             'fields': fields,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -546,7 +544,7 @@ def search_for_content(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/search']),
                 method='GET',
diff --git a/box_sdk_gen/managers/session_termination.py b/box_sdk_gen/managers/session_termination.py
index 34f74eb1..1b4d8a1f 100644
--- a/box_sdk_gen/managers/session_termination.py
+++ b/box_sdk_gen/managers/session_termination.py
@@ -20,18 +20,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -76,7 +74,7 @@ def terminate_users_sessions(
             extra_headers = {}
         request_body: Dict = {'user_ids': user_ids, 'user_logins': user_logins}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -121,7 +119,7 @@ def terminate_groups_sessions(
             extra_headers = {}
         request_body: Dict = {'group_ids': group_ids}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shared_links_files.py b/box_sdk_gen/managers/shared_links_files.py
index 9ab0e379..041ce7e1 100644
--- a/box_sdk_gen/managers/shared_links_files.py
+++ b/box_sdk_gen/managers/shared_links_files.py
@@ -30,6 +30,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -311,7 +309,7 @@ def find_file_for_shared_link(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/shared_items']
@@ -354,7 +352,7 @@ def get_shared_link_for_file(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -408,7 +406,7 @@ def add_share_link_to_file(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -462,7 +460,7 @@ def update_shared_link_on_file(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -519,7 +517,7 @@ def remove_shared_link_from_file(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shared_links_folders.py b/box_sdk_gen/managers/shared_links_folders.py
index c988f45e..c048ccfa 100644
--- a/box_sdk_gen/managers/shared_links_folders.py
+++ b/box_sdk_gen/managers/shared_links_folders.py
@@ -30,6 +30,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -301,7 +299,7 @@ def find_folder_for_shared_link(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -350,7 +348,7 @@ def get_shared_link_for_folder(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -408,7 +406,7 @@ def add_share_link_to_folder(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -465,7 +463,7 @@ def update_shared_link_on_folder(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -525,7 +523,7 @@ def remove_shared_link_from_folder(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shared_links_web_links.py b/box_sdk_gen/managers/shared_links_web_links.py
index ca5ae936..a454d419 100644
--- a/box_sdk_gen/managers/shared_links_web_links.py
+++ b/box_sdk_gen/managers/shared_links_web_links.py
@@ -30,6 +30,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -299,7 +297,7 @@ def find_web_link_for_shared_link(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -339,7 +337,7 @@ def get_shared_link_for_web_link(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -388,7 +386,7 @@ def add_share_link_to_web_link(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -436,7 +434,7 @@ def update_shared_link_on_web_link(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -487,7 +485,7 @@ def remove_shared_link_from_web_link(
         request_body: Dict = {'shared_link': shared_link}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shield_information_barrier_reports.py b/box_sdk_gen/managers/shield_information_barrier_reports.py
index 6531fd56..d25c0bce 100644
--- a/box_sdk_gen/managers/shield_information_barrier_reports.py
+++ b/box_sdk_gen/managers/shield_information_barrier_reports.py
@@ -20,8 +20,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.shield_information_barrier_report import (
     ShieldInformationBarrierReport,
 )
@@ -30,10 +28,16 @@
     ShieldInformationBarrierReference,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -42,12 +46,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -97,7 +95,7 @@ def get_shield_information_barrier_reports(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -130,7 +128,7 @@ def create_shield_information_barrier_report(
             extra_headers = {}
         request_body: Dict = {'shield_information_barrier': shield_information_barrier}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -166,7 +164,7 @@ def get_shield_information_barrier_report_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shield_information_barrier_segment_members.py b/box_sdk_gen/managers/shield_information_barrier_segment_members.py
index 358d32e0..cedeaa72 100644
--- a/box_sdk_gen/managers/shield_information_barrier_segment_members.py
+++ b/box_sdk_gen/managers/shield_information_barrier_segment_members.py
@@ -20,8 +20,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.shield_information_barrier_segment_members import (
     ShieldInformationBarrierSegmentMembers,
 )
@@ -32,22 +30,22 @@
 
 from box_sdk_gen.schemas.user_base import UserBase
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -123,7 +121,7 @@ def get_shield_information_barrier_segment_member_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -161,7 +159,7 @@ def delete_shield_information_barrier_segment_member_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -216,7 +214,7 @@ def get_shield_information_barrier_segment_members(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -264,7 +262,7 @@ def create_shield_information_barrier_segment_member(
             'user': user,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shield_information_barrier_segment_restrictions.py b/box_sdk_gen/managers/shield_information_barrier_segment_restrictions.py
index 74bad502..e499efbe 100644
--- a/box_sdk_gen/managers/shield_information_barrier_segment_restrictions.py
+++ b/box_sdk_gen/managers/shield_information_barrier_segment_restrictions.py
@@ -20,8 +20,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.shield_information_barrier_segment_restrictions import (
     ShieldInformationBarrierSegmentRestrictions,
 )
@@ -30,22 +28,22 @@
     ShieldInformationBarrierBase,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -152,7 +150,7 @@ def get_shield_information_barrier_segment_restriction_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -190,7 +188,7 @@ def delete_shield_information_barrier_segment_restriction_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -245,7 +243,7 @@ def get_shield_information_barrier_segment_restrictions(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -298,7 +296,7 @@ def create_shield_information_barrier_segment_restriction(
             'restricted_segment': restricted_segment,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shield_information_barrier_segments.py b/box_sdk_gen/managers/shield_information_barrier_segments.py
index 916003aa..77ecaf5b 100644
--- a/box_sdk_gen/managers/shield_information_barrier_segments.py
+++ b/box_sdk_gen/managers/shield_information_barrier_segments.py
@@ -20,8 +20,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.shield_information_barrier_segments import (
     ShieldInformationBarrierSegments,
 )
@@ -30,22 +28,22 @@
     ShieldInformationBarrierBase,
 )
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -80,7 +78,7 @@ def get_shield_information_barrier_segment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -118,7 +116,7 @@ def delete_shield_information_barrier_segment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -161,7 +159,7 @@ def update_shield_information_barrier_segment_by_id(
             extra_headers = {}
         request_body: Dict = {'name': name, 'description': description}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -218,7 +216,7 @@ def get_shield_information_barrier_segments(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -261,7 +259,7 @@ def create_shield_information_barrier_segment(
             'description': description,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/shield_information_barriers.py b/box_sdk_gen/managers/shield_information_barriers.py
index 0451e325..b3784dae 100644
--- a/box_sdk_gen/managers/shield_information_barriers.py
+++ b/box_sdk_gen/managers/shield_information_barriers.py
@@ -16,28 +16,26 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.shield_information_barriers import ShieldInformationBarriers
 
 from box_sdk_gen.schemas.enterprise_base import EnterpriseBase
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -77,7 +75,7 @@ def get_shield_information_barrier_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -115,7 +113,7 @@ def update_shield_information_barrier_status(
             extra_headers = {}
         request_body: Dict = {'id': id, 'status': status}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -160,7 +158,7 @@ def get_shield_information_barriers(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -201,7 +199,7 @@ def create_shield_information_barrier(
             extra_headers = {}
         request_body: Dict = {'enterprise': enterprise}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/sign_requests.py b/box_sdk_gen/managers/sign_requests.py
index cc1ce58f..46b89360 100644
--- a/box_sdk_gen/managers/sign_requests.py
+++ b/box_sdk_gen/managers/sign_requests.py
@@ -30,28 +30,26 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.sign_requests import SignRequests
 
 from box_sdk_gen.schemas.sign_request_create_request import SignRequestCreateRequest
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -92,7 +90,7 @@ def cancel_sign_request(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -128,7 +126,7 @@ def resend_sign_request(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -164,7 +162,7 @@ def get_sign_request_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -210,7 +208,7 @@ def get_sign_requests(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/sign_requests']
@@ -318,7 +316,7 @@ def create_sign_request(
             'external_system_name': external_system_name,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/sign_requests']
diff --git a/box_sdk_gen/managers/sign_templates.py b/box_sdk_gen/managers/sign_templates.py
index 51d0dd80..531c1f0c 100644
--- a/box_sdk_gen/managers/sign_templates.py
+++ b/box_sdk_gen/managers/sign_templates.py
@@ -12,14 +12,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.sign_template import SignTemplate
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -28,12 +32,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -74,7 +72,7 @@ def get_sign_templates(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/sign_templates']
@@ -106,7 +104,7 @@ def get_sign_template_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/skills.py b/box_sdk_gen/managers/skills.py
index 47b70c7f..af8c1e81 100644
--- a/box_sdk_gen/managers/skills.py
+++ b/box_sdk_gen/managers/skills.py
@@ -22,8 +22,6 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.keyword_skill_card import KeywordSkillCard
 
 from box_sdk_gen.schemas.timeline_skill_card import TimelineSkillCard
@@ -32,22 +30,22 @@
 
 from box_sdk_gen.schemas.status_skill_card import StatusSkillCard
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -216,7 +214,7 @@ def get_box_skill_cards_on_file(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -269,7 +267,7 @@ def create_box_skill_cards_on_file(
             extra_headers = {}
         request_body: Dict = {'cards': cards}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -316,7 +314,7 @@ def update_box_skill_cards_on_file(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -357,7 +355,7 @@ def delete_box_skill_cards_from_file(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -423,7 +421,7 @@ def update_all_skill_cards_on_file(
             'usage': usage,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/storage_policies.py b/box_sdk_gen/managers/storage_policies.py
index 948e12fa..54f08cb9 100644
--- a/box_sdk_gen/managers/storage_policies.py
+++ b/box_sdk_gen/managers/storage_policies.py
@@ -14,14 +14,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.storage_policy import StoragePolicy
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -30,12 +34,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -91,7 +89,7 @@ def get_storage_policies(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/storage_policies']
@@ -123,7 +121,7 @@ def get_storage_policy_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/storage_policy_assignments.py b/box_sdk_gen/managers/storage_policy_assignments.py
index b90a9ab3..b753fd94 100644
--- a/box_sdk_gen/managers/storage_policy_assignments.py
+++ b/box_sdk_gen/managers/storage_policy_assignments.py
@@ -18,14 +18,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.storage_policy_assignment import StoragePolicyAssignment
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -164,7 +162,7 @@ def get_storage_policy_assignments(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -207,7 +205,7 @@ def create_storage_policy_assignment(
             'assigned_to': assigned_to,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -243,7 +241,7 @@ def get_storage_policy_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -283,7 +281,7 @@ def update_storage_policy_assignment_by_id(
             extra_headers = {}
         request_body: Dict = {'storage_policy': storage_policy}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -335,7 +333,7 @@ def delete_storage_policy_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/task_assignments.py b/box_sdk_gen/managers/task_assignments.py
index 62ab687e..4a9c986c 100644
--- a/box_sdk_gen/managers/task_assignments.py
+++ b/box_sdk_gen/managers/task_assignments.py
@@ -18,26 +18,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.task_assignment import TaskAssignment
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -121,7 +119,7 @@ def get_task_assignments(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -166,7 +164,7 @@ def create_task_assignment(
             extra_headers = {}
         request_body: Dict = {'task': task, 'assign_to': assign_to}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/task_assignments']
@@ -199,7 +197,7 @@ def get_task_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -249,7 +247,7 @@ def update_task_assignment_by_id(
             extra_headers = {}
         request_body: Dict = {'message': message, 'resolution_state': resolution_state}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -286,7 +284,7 @@ def delete_task_assignment_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/tasks.py b/box_sdk_gen/managers/tasks.py
index 49f058f8..3f61b73f 100644
--- a/box_sdk_gen/managers/tasks.py
+++ b/box_sdk_gen/managers/tasks.py
@@ -18,26 +18,24 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.task import Task
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import sd_to_json
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -125,7 +123,7 @@ def get_file_tasks(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -193,7 +191,7 @@ def create_task(
             'completion_rule': completion_rule,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/tasks']),
                 method='POST',
@@ -221,7 +219,7 @@ def get_task_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -287,7 +285,7 @@ def update_task_by_id(
             'completion_rule': completion_rule,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -321,7 +319,7 @@ def delete_task_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/terms_of_service_user_statuses.py b/box_sdk_gen/managers/terms_of_service_user_statuses.py
index b9804a01..a023e71a 100644
--- a/box_sdk_gen/managers/terms_of_service_user_statuses.py
+++ b/box_sdk_gen/managers/terms_of_service_user_statuses.py
@@ -20,14 +20,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.terms_of_service_user_status import TermsOfServiceUserStatus
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -135,7 +133,7 @@ def get_terms_of_service_user_statuses(
             {'tos_id': to_string(tos_id), 'user_id': to_string(user_id)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -176,7 +174,7 @@ def create_terms_of_service_status_for_user(
             extra_headers = {}
         request_body: Dict = {'tos': tos, 'user': user, 'is_accepted': is_accepted}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -216,7 +214,7 @@ def update_terms_of_service_status_for_user_by_id(
             extra_headers = {}
         request_body: Dict = {'is_accepted': is_accepted}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/terms_of_services.py b/box_sdk_gen/managers/terms_of_services.py
index 47b69b81..2440409f 100644
--- a/box_sdk_gen/managers/terms_of_services.py
+++ b/box_sdk_gen/managers/terms_of_services.py
@@ -16,14 +16,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.terms_of_service import TermsOfService
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -32,12 +36,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -95,7 +93,7 @@ def get_terms_of_service(
             {'tos_type': to_string(tos_type)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/terms_of_services']
@@ -139,7 +137,7 @@ def create_terms_of_service(
             extra_headers = {}
         request_body: Dict = {'status': status, 'tos_type': tos_type, 'text': text}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/terms_of_services']
@@ -172,7 +170,7 @@ def get_terms_of_service_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -216,7 +214,7 @@ def update_terms_of_service_by_id(
             extra_headers = {}
         request_body: Dict = {'status': status, 'text': text}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/transfer.py b/box_sdk_gen/managers/transfer.py
index 07034d55..83db03c0 100644
--- a/box_sdk_gen/managers/transfer.py
+++ b/box_sdk_gen/managers/transfer.py
@@ -24,6 +24,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -32,12 +36,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -169,7 +167,7 @@ def transfer_owned_folder(
             {'fields': to_string(fields), 'notify': to_string(notify)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/trashed_files.py b/box_sdk_gen/managers/trashed_files.py
index 2543dbd5..165c3e4c 100644
--- a/box_sdk_gen/managers/trashed_files.py
+++ b/box_sdk_gen/managers/trashed_files.py
@@ -18,14 +18,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.trash_file import TrashFile
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -111,7 +109,7 @@ def restore_file_from_trash(
         request_body: Dict = {'name': name, 'parent': parent}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -191,7 +189,7 @@ def get_trashed_file_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -234,7 +232,7 @@ def delete_trashed_file_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/trashed_folders.py b/box_sdk_gen/managers/trashed_folders.py
index 87f02139..a43667e6 100644
--- a/box_sdk_gen/managers/trashed_folders.py
+++ b/box_sdk_gen/managers/trashed_folders.py
@@ -18,14 +18,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.trash_folder import TrashFolder
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -129,7 +127,7 @@ def restore_folder_from_trash(
         request_body: Dict = {'name': name, 'parent': parent}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -212,7 +210,7 @@ def get_trashed_folder_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -261,7 +259,7 @@ def delete_trashed_folder_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/trashed_items.py b/box_sdk_gen/managers/trashed_items.py
index 933d4f19..242cd2ed 100644
--- a/box_sdk_gen/managers/trashed_items.py
+++ b/box_sdk_gen/managers/trashed_items.py
@@ -22,6 +22,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -30,12 +34,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -154,7 +152,7 @@ def get_trashed_items(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/trashed_web_links.py b/box_sdk_gen/managers/trashed_web_links.py
index 7ab1a808..8a86e1e0 100644
--- a/box_sdk_gen/managers/trashed_web_links.py
+++ b/box_sdk_gen/managers/trashed_web_links.py
@@ -18,14 +18,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.trash_web_link import TrashWebLink
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -105,7 +103,7 @@ def restore_weblink_from_trash(
         request_body: Dict = {'name': name, 'parent': parent}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -155,7 +153,7 @@ def get_trashed_web_link_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -195,7 +193,7 @@ def delete_trashed_web_link_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/uploads.py b/box_sdk_gen/managers/uploads.py
index 73fbdad1..cde9591c 100644
--- a/box_sdk_gen/managers/uploads.py
+++ b/box_sdk_gen/managers/uploads.py
@@ -18,16 +18,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.upload_url import UploadUrl
 
 from box_sdk_gen.schemas.conflict_error import ConflictError
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -38,12 +42,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.networking.fetch_options import MultipartItem
 
 from box_sdk_gen.serialization.json import SerializedData
@@ -234,7 +232,7 @@ def upload_file_version(
                 **extra_headers,
             }
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -291,7 +289,7 @@ def preflight_file_upload_check(
             extra_headers = {}
         request_body: Dict = {'name': name, 'size': size, 'parent': parent}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/files/content']
@@ -387,7 +385,7 @@ def upload_file(
         headers_map: Dict[str, str] = prepare_params(
             {'content-md5': to_string(content_md_5), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.upload_url, '/2.0/files/content']
diff --git a/box_sdk_gen/managers/user_collaborations.py b/box_sdk_gen/managers/user_collaborations.py
index e53994d3..d5baba19 100644
--- a/box_sdk_gen/managers/user_collaborations.py
+++ b/box_sdk_gen/managers/user_collaborations.py
@@ -26,6 +26,10 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -34,12 +38,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import DateTime
@@ -175,7 +173,7 @@ def get_collaboration_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -261,7 +259,7 @@ def update_collaboration_by_id(
             'can_view_path': can_view_path,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -300,7 +298,7 @@ def delete_collaboration_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -429,7 +427,7 @@ def create_collaboration(
             {'fields': to_string(fields), 'notify': to_string(notify)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/collaborations']
diff --git a/box_sdk_gen/managers/users.py b/box_sdk_gen/managers/users.py
index 65d865af..df6f8cb4 100644
--- a/box_sdk_gen/managers/users.py
+++ b/box_sdk_gen/managers/users.py
@@ -24,16 +24,20 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.user_full import UserFull
 
 from box_sdk_gen.schemas.tracking_code import TrackingCode
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -42,12 +46,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -207,7 +205,7 @@ def get_users(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/users']),
                 method='GET',
@@ -337,7 +335,7 @@ def create_user(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/users']),
                 method='POST',
@@ -395,7 +393,7 @@ def get_user_me(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/users/me']),
                 method='GET',
@@ -461,7 +459,7 @@ def get_user_by_id(
             extra_headers = {}
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -625,7 +623,7 @@ def update_user_by_id(
         }
         query_params_map: Dict[str, str] = prepare_params({'fields': to_string(fields)})
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -683,7 +681,7 @@ def delete_user_by_id(
             {'notify': to_string(notify), 'force': to_string(force)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/web_links.py b/box_sdk_gen/managers/web_links.py
index 428774ad..d2ade646 100644
--- a/box_sdk_gen/managers/web_links.py
+++ b/box_sdk_gen/managers/web_links.py
@@ -24,18 +24,16 @@
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.serialization.json import sd_to_json
@@ -169,7 +167,7 @@ def create_web_link(
             'description': description,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/web_links']
@@ -216,7 +214,7 @@ def get_web_link_by_id(
         headers_map: Dict[str, str] = prepare_params(
             {'boxapi': to_string(boxapi), **extra_headers}
         )
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -272,7 +270,7 @@ def update_web_link_by_id(
             'shared_link': shared_link,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -309,7 +307,7 @@ def delete_web_link_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/webhooks.py b/box_sdk_gen/managers/webhooks.py
index ee5111ba..3cf6f7db 100644
--- a/box_sdk_gen/managers/webhooks.py
+++ b/box_sdk_gen/managers/webhooks.py
@@ -20,14 +20,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.webhook import Webhook
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -232,7 +230,7 @@ def get_webhooks(
             {'marker': to_string(marker), 'limit': to_string(limit)}
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/webhooks']),
                 method='GET',
@@ -273,7 +271,7 @@ def create_webhook(
             'triggers': triggers,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join([self.network_session.base_urls.base_url, '/2.0/webhooks']),
                 method='POST',
@@ -304,7 +302,7 @@ def get_webhook_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -354,7 +352,7 @@ def update_webhook_by_id(
             'triggers': triggers,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
@@ -391,7 +389,7 @@ def delete_webhook_by_id(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/workflows.py b/box_sdk_gen/managers/workflows.py
index 555d4bef..3eacaca9 100644
--- a/box_sdk_gen/managers/workflows.py
+++ b/box_sdk_gen/managers/workflows.py
@@ -20,14 +20,18 @@
 
 from box_sdk_gen.schemas.client_error import ClientError
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.outcome import Outcome
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
@@ -36,12 +40,6 @@
 
 from box_sdk_gen.serialization.json import sd_to_json
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 
@@ -180,7 +178,7 @@ def get_workflows(
             }
         )
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/workflows']
@@ -241,7 +239,7 @@ def start_workflow(
             'outcomes': outcomes,
         }
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [
diff --git a/box_sdk_gen/managers/zip_downloads.py b/box_sdk_gen/managers/zip_downloads.py
index 22970cc9..117408de 100644
--- a/box_sdk_gen/managers/zip_downloads.py
+++ b/box_sdk_gen/managers/zip_downloads.py
@@ -20,26 +20,24 @@
 
 from box_sdk_gen.schemas.zip_download_request import ZipDownloadRequest
 
-from box_sdk_gen.box.errors import BoxSDKError
-
 from box_sdk_gen.schemas.zip_download_status import ZipDownloadStatus
 
+from box_sdk_gen.box.errors import BoxSDKError
+
 from box_sdk_gen.networking.auth import Authentication
 
 from box_sdk_gen.networking.network import NetworkSession
 
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
 from box_sdk_gen.internal.utils import prepare_params
 
 from box_sdk_gen.internal.utils import to_string
 
 from box_sdk_gen.internal.utils import ByteStream
 
-from box_sdk_gen.networking.fetch_options import FetchOptions
-
-from box_sdk_gen.networking.fetch_response import FetchResponse
-
-from box_sdk_gen.networking.fetch import fetch
-
 from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.serialization.json import sd_to_json
@@ -160,7 +158,7 @@ def create_zip_download(
             extra_headers = {}
         request_body: Dict = {'items': items, 'download_file_name': download_file_name}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=''.join(
                     [self.network_session.base_urls.base_url, '/2.0/zip_downloads']
@@ -223,7 +221,7 @@ def get_zip_download_content(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=download_url,
                 method='GET',
@@ -279,7 +277,7 @@ def get_zip_download_status(
         if extra_headers is None:
             extra_headers = {}
         headers_map: Dict[str, str] = prepare_params({**extra_headers})
-        response: FetchResponse = fetch(
+        response: FetchResponse = self.network_session.network_client.fetch(
             FetchOptions(
                 url=status_url,
                 method='GET',
diff --git a/box_sdk_gen/networking/__init__.py b/box_sdk_gen/networking/__init__.py
index bbbd1796..ddbefe60 100644
--- a/box_sdk_gen/networking/__init__.py
+++ b/box_sdk_gen/networking/__init__.py
@@ -1,3 +1,5 @@
+from box_sdk_gen.networking.box_network_client import *
+
 from box_sdk_gen.networking.proxy_config import *
 
 from box_sdk_gen.networking.network import *
@@ -8,7 +10,7 @@
 
 from box_sdk_gen.networking.fetch_response import *
 
-from box_sdk_gen.networking.fetch import *
+from box_sdk_gen.networking.network_client import *
 
 from box_sdk_gen.networking.base_urls import *
 
diff --git a/box_sdk_gen/networking/box_network_client.py b/box_sdk_gen/networking/box_network_client.py
new file mode 100644
index 00000000..0b44c3a9
--- /dev/null
+++ b/box_sdk_gen/networking/box_network_client.py
@@ -0,0 +1,382 @@
+import io
+
+import math
+import random
+import time
+from collections import OrderedDict
+from dataclasses import dataclass
+from typing import Optional, Dict, Union
+from sys import version_info as py_version
+from http import HTTPStatus
+
+import requests
+from requests import RequestException, Session, Response
+from requests_toolbelt import MultipartEncoder
+
+from ..networking.fetch_options import FetchOptions
+from ..networking.fetch_response import FetchResponse
+from ..box.errors import BoxAPIError, BoxSDKError, RequestInfo, ResponseInfo
+from ..internal.utils import ByteStream, ResponseByteStream
+from ..networking.network_client import NetworkClient
+from ..serialization.json import (
+    sd_to_json,
+    sd_to_url_params,
+    json_to_serialized_data,
+)
+from ..networking.version import __version__
+
+DEFAULT_MAX_ATTEMPTS = 5
+_RETRY_RANDOMIZATION_FACTOR = 0.5
+_RETRY_BASE_INTERVAL = 1
+SDK_VERSION = __version__
+USER_AGENT_HEADER = f'box-python-generated-sdk-{SDK_VERSION}'
+X_BOX_UA_HEADER = (
+    f'agent=box-python-generated-sdk/{SDK_VERSION}; '
+    f'env=python/{py_version.major}.{py_version.minor}.{py_version.micro}'
+)
+
+
+@dataclass
+class APIRequest:
+    method: str
+    url: str
+    headers: Dict[str, str]
+    params: Dict[str, str]
+    data: Optional[Union[str, ByteStream, MultipartEncoder]]
+    allow_redirects: bool = True
+
+
+@dataclass
+class APIResponse:
+    network_response: Optional[Response] = None
+    reauthentication_needed: Optional[bool] = False
+    raised_exception: Optional[Exception] = None
+
+    def get_header(
+        self, header_name: str, default_value: Optional[str] = None
+    ) -> Optional[str]:
+        try:
+            return self.network_response.headers[header_name]
+        except (ValueError, KeyError, AttributeError):
+            return default_value
+
+
+class BoxNetworkClient(NetworkClient):
+    def __init__(self, requests_session: Optional[Session] = None):
+        super().__init__()
+        self.requests_session = requests_session or requests.Session()
+
+    def fetch(self, options: 'FetchOptions') -> FetchResponse:
+        if options.network_session:
+            max_attempts = options.network_session.MAX_ATTEMPTS
+        else:
+            max_attempts = DEFAULT_MAX_ATTEMPTS
+
+        attempt_nr = 1
+        response = APIResponse()
+
+        options_stream_position = self._get_options_stream_position(options)
+        multipart_streams_positions = self._get_multipart_stream_positions(options)
+
+        while True:
+            request: APIRequest = self._prepare_request(
+                options=options, reauthenticate=response.reauthentication_needed
+            )
+            response: APIResponse = self._make_request(request=request)
+
+            # Retry network exception only once
+            if response.raised_exception and attempt_nr > 1:
+                break
+
+            if response.network_response is not None:
+                network_response = response.network_response
+                accepted_with_retry_after = (
+                    network_response.status_code == HTTPStatus.ACCEPTED
+                ) and response.get_header('Retry-After', None)
+                if network_response.ok and (
+                    not accepted_with_retry_after or attempt_nr >= max_attempts
+                ):
+                    if options.response_format == 'binary':
+                        return FetchResponse(
+                            url=network_response.url,
+                            status=network_response.status_code,
+                            headers=dict(response.network_response.headers),
+                            content=ResponseByteStream(
+                                response.network_response.iter_content(chunk_size=1024)
+                            ),
+                        )
+                    else:
+                        return FetchResponse(
+                            url=network_response.url,
+                            status=network_response.status_code,
+                            headers=dict(response.network_response.headers),
+                            data=(
+                                json_to_serialized_data(network_response.text)
+                                if network_response.text
+                                else None
+                            ),
+                            content=io.BytesIO(network_response.content),
+                        )
+
+                if (
+                    not (response.reauthentication_needed and options.auth)
+                    and network_response.status_code != HTTPStatus.TOO_MANY_REQUESTS
+                    and not accepted_with_retry_after
+                    and network_response.status_code < 500
+                ):
+                    self._raise_on_unsuccessful_request(
+                        request=request, response=response
+                    )
+
+            if attempt_nr >= max_attempts:
+                break
+
+            time.sleep(
+                self._get_retry_after_time(
+                    attempt_number=attempt_nr,
+                    retry_after_header=response.get_header('Retry-After', None),
+                )
+            )
+
+            self._reset_options_stream(
+                options, options_stream_position, response.raised_exception
+            )
+            self._reset_multipart_streams(
+                options, multipart_streams_positions, response.raised_exception
+            )
+
+            attempt_nr += 1
+
+        self._raise_on_unsuccessful_request(request=request, response=response)
+
+    def _prepare_request(
+        self, options: 'FetchOptions', reauthenticate: bool = False
+    ) -> APIRequest:
+        headers = self._prepare_headers(options, reauthenticate)
+        params = options.params or {}
+        data = self._prepare_body(
+            options.content_type, options.file_stream or options.data
+        )
+        allow_redirects = options.follow_redirects
+
+        if options.content_type:
+            if options.content_type == 'multipart/form-data':
+                fields = OrderedDict()
+                for part in options.multipart_data:
+                    if part.data:
+                        fields[part.part_name] = sd_to_json(part.data)
+                    else:
+                        fields[part.part_name] = (
+                            part.file_name or '',
+                            part.file_stream,
+                            part.content_type,
+                        )
+
+                multipart_stream = MultipartEncoder(fields)
+                data = multipart_stream
+                headers['Content-Type'] = multipart_stream.content_type
+            else:
+                headers['Content-Type'] = options.content_type
+
+        return APIRequest(
+            method=options.method,
+            url=options.url,
+            headers=headers,
+            params=params,
+            data=data,
+            allow_redirects=allow_redirects,
+        )
+
+    @staticmethod
+    def _prepare_headers(
+        options: 'FetchOptions', reauthenticate: bool = False
+    ) -> Dict[str, str]:
+        headers = {}
+        if options.network_session:
+            headers.update(options.network_session.additional_headers)
+        if options.headers:
+            headers.update(options.headers)
+        if options.auth:
+            if reauthenticate:
+                options.auth.refresh_token(network_session=options.network_session)
+            headers['Authorization'] = options.auth.retrieve_authorization_header(
+                network_session=options.network_session
+            )
+
+        headers['User-Agent'] = USER_AGENT_HEADER
+        headers['X-Box-UA'] = X_BOX_UA_HEADER
+        return headers
+
+    @staticmethod
+    def _prepare_body(
+        content_type: str, data: Union[dict, ByteStream]
+    ) -> Optional[Union[str, ByteStream]]:
+        if (
+            content_type == 'application/json'
+            or content_type == 'application/json-patch+json'
+        ):
+            return sd_to_json(data) if data else None
+        if content_type == 'application/x-www-form-urlencoded':
+            return sd_to_url_params(data)
+        if (
+            content_type == 'multipart/form-data'
+            or content_type == 'application/octet-stream'
+        ):
+            return data
+        raise
+
+    def _make_request(self, request: APIRequest) -> APIResponse:
+        raised_exception = None
+        reauthentication_needed = False
+        try:
+            network_response = self.requests_session.request(
+                method=request.method,
+                url=request.url,
+                headers=request.headers,
+                data=request.data,
+                params=request.params,
+                allow_redirects=request.allow_redirects,
+                stream=True,
+            )
+            reauthentication_needed = (
+                network_response.status_code == HTTPStatus.UNAUTHORIZED
+            )
+        except RequestException as request_exc:
+            raised_exception = request_exc
+            network_response = None
+
+            if 'EOF occurred in violation of protocol' in str(request_exc):
+                reauthentication_needed = True
+
+        return APIResponse(
+            network_response=network_response,
+            reauthentication_needed=reauthentication_needed,
+            raised_exception=raised_exception,
+        )
+
+    @staticmethod
+    def _raise_on_unsuccessful_request(
+        request: APIRequest, response: APIResponse
+    ) -> None:
+        if response.raised_exception:
+            raise BoxSDKError(
+                message=str(response.raised_exception), error=response.raised_exception
+            )
+
+        network_response = response.network_response
+
+        try:
+            response_json = network_response.json()
+        except ValueError:
+            response_json = {}
+
+        raise BoxAPIError(
+            message=f'{network_response.status_code} {response_json.get("message", "")}; Request ID: {response_json.get("request_id", "")}',
+            request_info=RequestInfo(
+                method=request.method,
+                url=request.url,
+                query_params=request.params,
+                headers=request.headers,
+                body=request.data,
+            ),
+            response_info=ResponseInfo(
+                status_code=network_response.status_code,
+                headers=dict(network_response.headers),
+                body=response_json,
+                raw_body=network_response.text,
+                code=response_json.get("code", None),
+                context_info=response_json.get("context_info", {}),
+                request_id=response_json.get("request_id", None),
+                help_url=response_json.get("help_url", None),
+            ),
+        )
+
+    @staticmethod
+    def _get_retry_after_time(
+        attempt_number: int, retry_after_header: Optional[str] = None
+    ) -> float:
+        if retry_after_header is not None:
+            try:
+                return int(retry_after_header)
+            except (ValueError, TypeError):
+                pass
+        min_randomization = 1 - _RETRY_RANDOMIZATION_FACTOR
+        max_randomization = 1 + _RETRY_RANDOMIZATION_FACTOR
+        randomization = (
+            random.uniform(0, 1) * (max_randomization - min_randomization)
+        ) + min_randomization
+        exponential = math.pow(2, attempt_number)
+        return exponential * _RETRY_BASE_INTERVAL * randomization
+
+    @staticmethod
+    def _get_multipart_stream_positions(options: 'FetchOptions') -> dict:
+        multipart_streams_positions = {}
+        if options.multipart_data:
+            for part in options.multipart_data:
+                if part.file_stream and part.file_stream.seekable():
+                    multipart_streams_positions[part.part_name] = (
+                        part.file_stream.tell()
+                    )
+        return multipart_streams_positions
+
+    @staticmethod
+    def _get_options_stream_position(options: 'FetchOptions') -> int:
+        filestream_position = 0
+        if options.file_stream and options.file_stream.seekable():
+            filestream_position = options.file_stream.tell()
+        return filestream_position
+
+    @staticmethod
+    def _validate_seekable(stream: ByteStream, raised_exception: Optional[Exception]):
+        if not stream.seekable():
+            raise BoxSDKError(
+                message='Request with non-seekable stream cannot be retried',
+                error=raised_exception,
+            )
+
+    def _reset_stream(
+        self,
+        stream: ByteStream,
+        original_position: int,
+        raised_exception: Optional[Exception],
+    ):
+        self._validate_seekable(stream, raised_exception)
+        stream.seek(original_position)
+
+    def _reset_options_stream(
+        self,
+        options: 'FetchOptions',
+        filestream_position: int,
+        raised_exception: Optional[Exception],
+    ):
+        if options.file_stream:
+            self._reset_stream(
+                options.file_stream, filestream_position, raised_exception
+            )
+
+    def _reset_multipart_streams(
+        self,
+        options: 'FetchOptions',
+        multipart_streams_positions: dict,
+        raised_exception: Optional[Exception],
+    ):
+        if not options.multipart_data:
+            return
+
+        for part in options.multipart_data:
+            if not part.file_stream:
+                continue
+
+            position = multipart_streams_positions.get(part.part_name)
+            # we didn't get position before sending request hence the stream must be non-seekable
+            if position is None:
+                raise BoxSDKError(
+                    message='Request with non-seekable stream cannot be retried',
+                    error=raised_exception,
+                )
+
+            self._reset_stream(
+                part.file_stream,
+                multipart_streams_positions[part.part_name],
+                raised_exception,
+            )
diff --git a/box_sdk_gen/networking/fetch.py b/box_sdk_gen/networking/fetch.py
deleted file mode 100644
index 47cbdaa4..00000000
--- a/box_sdk_gen/networking/fetch.py
+++ /dev/null
@@ -1,370 +0,0 @@
-import io
-
-import math
-import random
-import time
-from collections import OrderedDict
-from dataclasses import dataclass
-from typing import Optional, Dict, List, Union
-from sys import version_info as py_version
-from http import HTTPStatus
-
-import requests
-from requests import RequestException, Session, Response
-from requests_toolbelt import MultipartEncoder
-
-from .fetch_options import FetchOptions
-from .fetch_response import FetchResponse
-from ..box.errors import BoxAPIError, BoxSDKError, RequestInfo, ResponseInfo
-from ..internal.utils import ByteStream, ResponseByteStream
-from ..serialization.json import (
-    sd_to_json,
-    sd_to_url_params,
-    json_to_serialized_data,
-)
-from .version import __version__
-
-DEFAULT_MAX_ATTEMPTS = 5
-_RETRY_RANDOMIZATION_FACTOR = 0.5
-_RETRY_BASE_INTERVAL = 1
-SDK_VERSION = __version__
-USER_AGENT_HEADER = f'box-python-generated-sdk-{SDK_VERSION}'
-X_BOX_UA_HEADER = (
-    f'agent=box-python-generated-sdk/{SDK_VERSION}; '
-    f'env=python/{py_version.major}.{py_version.minor}.{py_version.micro}'
-)
-
-
-@dataclass
-class APIRequest:
-    method: str
-    url: str
-    headers: Dict[str, str]
-    params: Dict[str, str]
-    data: Optional[Union[str, ByteStream, MultipartEncoder]]
-    allow_redirects: bool = True
-
-
-@dataclass
-class APIResponse:
-    network_response: Optional[Response] = None
-    reauthentication_needed: Optional[bool] = False
-    raised_exception: Optional[Exception] = None
-
-    def get_header(
-        self, header_name: str, default_value: Optional[str] = None
-    ) -> Optional[str]:
-        try:
-            return self.network_response.headers[header_name]
-        except (ValueError, KeyError, AttributeError):
-            return default_value
-
-
-def fetch(options: FetchOptions) -> FetchResponse:
-    if options.network_session:
-        max_attempts = options.network_session.MAX_ATTEMPTS
-        requests_session = options.network_session.requests_session
-    else:
-        max_attempts = DEFAULT_MAX_ATTEMPTS
-        requests_session = requests.Session()
-
-    attempt_nr = 1
-    response = APIResponse()
-
-    options_stream_position = __get_options_stream_position(options)
-    multipart_streams_positions = __get_multipart_stream_positions(options)
-
-    while True:
-        request: APIRequest = __prepare_request(
-            options=options, reauthenticate=response.reauthentication_needed
-        )
-        response: APIResponse = __make_request(
-            request=request, session=requests_session
-        )
-
-        # Retry network exception only once
-        if response.raised_exception and attempt_nr > 1:
-            break
-
-        if response.network_response is not None:
-            network_response = response.network_response
-            accepted_with_retry_after = (
-                network_response.status_code == HTTPStatus.ACCEPTED
-            ) and response.get_header('Retry-After', None)
-            if network_response.ok and (
-                not accepted_with_retry_after or attempt_nr >= max_attempts
-            ):
-                if options.response_format == 'binary':
-                    return FetchResponse(
-                        url=network_response.url,
-                        status=network_response.status_code,
-                        headers=dict(response.network_response.headers),
-                        content=ResponseByteStream(
-                            response.network_response.iter_content(chunk_size=1024)
-                        ),
-                    )
-                else:
-                    return FetchResponse(
-                        url=network_response.url,
-                        status=network_response.status_code,
-                        headers=dict(response.network_response.headers),
-                        data=(
-                            json_to_serialized_data(network_response.text)
-                            if network_response.text
-                            else None
-                        ),
-                        content=io.BytesIO(network_response.content),
-                    )
-
-            if (
-                not (response.reauthentication_needed and options.auth)
-                and network_response.status_code != HTTPStatus.TOO_MANY_REQUESTS
-                and not accepted_with_retry_after
-                and network_response.status_code < 500
-            ):
-                __raise_on_unsuccessful_request(request=request, response=response)
-
-        if attempt_nr >= max_attempts:
-            break
-
-        time.sleep(
-            __get_retry_after_time(
-                attempt_number=attempt_nr,
-                retry_after_header=response.get_header('Retry-After', None),
-            )
-        )
-
-        __reset_options_stream(
-            options, options_stream_position, response.raised_exception
-        )
-        __reset_multipart_streams(
-            options, multipart_streams_positions, response.raised_exception
-        )
-
-        attempt_nr += 1
-
-    __raise_on_unsuccessful_request(request=request, response=response)
-
-
-def __prepare_request(
-    options: FetchOptions, reauthenticate: bool = False
-) -> APIRequest:
-    headers = __prepare_headers(options, reauthenticate)
-    params = options.params or {}
-    data = __prepare_body(options.content_type, options.file_stream or options.data)
-    allow_redirects = options.follow_redirects
-
-    if options.content_type:
-        if options.content_type == 'multipart/form-data':
-            fields = OrderedDict()
-            for part in options.multipart_data:
-                if part.data:
-                    fields[part.part_name] = sd_to_json(part.data)
-                else:
-                    fields[part.part_name] = (
-                        part.file_name or '',
-                        part.file_stream,
-                        part.content_type,
-                    )
-
-            multipart_stream = MultipartEncoder(fields)
-            data = multipart_stream
-            headers['Content-Type'] = multipart_stream.content_type
-        else:
-            headers['Content-Type'] = options.content_type
-
-    return APIRequest(
-        method=options.method,
-        url=options.url,
-        headers=headers,
-        params=params,
-        data=data,
-        allow_redirects=allow_redirects,
-    )
-
-
-def __prepare_headers(
-    options: FetchOptions, reauthenticate: bool = False
-) -> Dict[str, str]:
-    headers = {}
-    if options.network_session:
-        headers.update(options.network_session.additional_headers)
-    if options.headers:
-        headers.update(options.headers)
-    if options.auth:
-        if reauthenticate:
-            options.auth.refresh_token(network_session=options.network_session)
-        headers['Authorization'] = options.auth.retrieve_authorization_header(
-            network_session=options.network_session
-        )
-
-    headers['User-Agent'] = USER_AGENT_HEADER
-    headers['X-Box-UA'] = X_BOX_UA_HEADER
-    return headers
-
-
-def __prepare_body(
-    content_type: str, data: Union[dict, ByteStream]
-) -> Optional[Union[str, ByteStream]]:
-    if (
-        content_type == 'application/json'
-        or content_type == 'application/json-patch+json'
-    ):
-        return sd_to_json(data) if data else None
-    if content_type == 'application/x-www-form-urlencoded':
-        return sd_to_url_params(data)
-    if (
-        content_type == 'multipart/form-data'
-        or content_type == 'application/octet-stream'
-    ):
-        return data
-    raise
-
-
-def __make_request(request: APIRequest, session: Session) -> APIResponse:
-    raised_exception = None
-    reauthentication_needed = False
-    try:
-        network_response = session.request(
-            method=request.method,
-            url=request.url,
-            headers=request.headers,
-            data=request.data,
-            params=request.params,
-            allow_redirects=request.allow_redirects,
-            stream=True,
-        )
-        reauthentication_needed = (
-            network_response.status_code == HTTPStatus.UNAUTHORIZED
-        )
-    except RequestException as request_exc:
-        raised_exception = request_exc
-        network_response = None
-
-        if 'EOF occurred in violation of protocol' in str(request_exc):
-            reauthentication_needed = True
-
-    return APIResponse(
-        network_response=network_response,
-        reauthentication_needed=reauthentication_needed,
-        raised_exception=raised_exception,
-    )
-
-
-def __raise_on_unsuccessful_request(request: APIRequest, response: APIResponse) -> None:
-    if response.raised_exception:
-        raise BoxSDKError(
-            message=str(response.raised_exception), error=response.raised_exception
-        )
-
-    network_response = response.network_response
-
-    try:
-        response_json = network_response.json()
-    except ValueError:
-        response_json = {}
-
-    raise BoxAPIError(
-        message=f'{network_response.status_code} {response_json.get("message", "")}; Request ID: {response_json.get("request_id", "")}',
-        request_info=RequestInfo(
-            method=request.method,
-            url=request.url,
-            query_params=request.params,
-            headers=request.headers,
-            body=request.data,
-        ),
-        response_info=ResponseInfo(
-            status_code=network_response.status_code,
-            headers=dict(network_response.headers),
-            body=response_json,
-            raw_body=network_response.text,
-            code=response_json.get("code", None),
-            context_info=response_json.get("context_info", {}),
-            request_id=response_json.get("request_id", None),
-            help_url=response_json.get("help_url", None),
-        ),
-    )
-
-
-def __get_retry_after_time(
-    attempt_number: int, retry_after_header: Optional[str] = None
-) -> float:
-    if retry_after_header is not None:
-        try:
-            return int(retry_after_header)
-        except (ValueError, TypeError):
-            pass
-    min_randomization = 1 - _RETRY_RANDOMIZATION_FACTOR
-    max_randomization = 1 + _RETRY_RANDOMIZATION_FACTOR
-    randomization = (
-        random.uniform(0, 1) * (max_randomization - min_randomization)
-    ) + min_randomization
-    exponential = math.pow(2, attempt_number)
-    return exponential * _RETRY_BASE_INTERVAL * randomization
-
-
-def __get_multipart_stream_positions(options: FetchOptions) -> dict:
-    multipart_streams_positions = {}
-    if options.multipart_data:
-        for part in options.multipart_data:
-            if part.file_stream and part.file_stream.seekable():
-                multipart_streams_positions[part.part_name] = part.file_stream.tell()
-    return multipart_streams_positions
-
-
-def __get_options_stream_position(options: FetchOptions) -> int:
-    filestream_position = 0
-    if options.file_stream and options.file_stream.seekable():
-        filestream_position = options.file_stream.tell()
-    return filestream_position
-
-
-def __validate_seekable(stream: ByteStream, raised_exception: Optional[Exception]):
-    if not stream.seekable():
-        raise BoxSDKError(
-            message='Request with non-seekable stream cannot be retried',
-            error=raised_exception,
-        )
-
-
-def __reset_stream(
-    stream: ByteStream, original_position: int, raised_exception: Optional[Exception]
-):
-    __validate_seekable(stream, raised_exception)
-    stream.seek(original_position)
-
-
-def __reset_options_stream(
-    options: FetchOptions,
-    filestream_position: int,
-    raised_exception: Optional[Exception],
-):
-    if options.file_stream:
-        __reset_stream(options.file_stream, filestream_position, raised_exception)
-
-
-def __reset_multipart_streams(
-    options: FetchOptions,
-    multipart_streams_positions: dict,
-    raised_exception: Optional[Exception],
-):
-    if not options.multipart_data:
-        return
-
-    for part in options.multipart_data:
-        if not part.file_stream:
-            continue
-
-        position = multipart_streams_positions.get(part.part_name)
-        # we didn't get position before sending request hence the stream must be non-seekable
-        if position is None:
-            raise BoxSDKError(
-                message='Request with non-seekable stream cannot be retried',
-                error=raised_exception,
-            )
-
-        __reset_stream(
-            part.file_stream,
-            multipart_streams_positions[part.part_name],
-            raised_exception,
-        )
diff --git a/box_sdk_gen/networking/fetch_options.py b/box_sdk_gen/networking/fetch_options.py
index 09682d76..84d85f21 100644
--- a/box_sdk_gen/networking/fetch_options.py
+++ b/box_sdk_gen/networking/fetch_options.py
@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from enum import Enum
 
 from typing import Optional
@@ -6,11 +10,13 @@
 
 from typing import List
 
-from box_sdk_gen.networking.auth import Authentication
+if TYPE_CHECKING:
+    from box_sdk_gen.networking.auth import Authentication
 
-from box_sdk_gen.serialization.json import SerializedData
+if TYPE_CHECKING:
+    from box_sdk_gen.networking.network import NetworkSession
 
-from box_sdk_gen.networking.network import NetworkSession
+from box_sdk_gen.serialization.json import SerializedData
 
 from box_sdk_gen.internal.utils import ByteStream
 
@@ -29,7 +35,7 @@ def __init__(
         data: Optional[SerializedData] = None,
         file_stream: Optional[ByteStream] = None,
         file_name: Optional[str] = None,
-        content_type: Optional[str] = None
+        content_type: Optional[str] = None,
     ):
         """
         :param part_name: Name of the part
@@ -65,7 +71,7 @@ def __init__(
         response_format: ResponseFormat = ResponseFormat.JSON,
         auth: Optional[Authentication] = None,
         network_session: Optional[NetworkSession] = None,
-        follow_redirects: Optional[bool] = True
+        follow_redirects: Optional[bool] = True,
     ):
         """
         :param url: URL of the request
diff --git a/box_sdk_gen/networking/network.py b/box_sdk_gen/networking/network.py
index 7a8cbc63..e17cfadc 100644
--- a/box_sdk_gen/networking/network.py
+++ b/box_sdk_gen/networking/network.py
@@ -1,6 +1,8 @@
 import requests
 from typing import Dict
 
+from .network_client import NetworkClient
+from .box_network_client import BoxNetworkClient
 from .proxy_config import ProxyConfig
 from .base_urls import BaseUrls
 
@@ -10,6 +12,8 @@ class NetworkSession:
 
     def __init__(
         self,
+        *,
+        network_client: NetworkClient = None,
         additional_headers: Dict[str, str] = None,
         base_urls: BaseUrls = None,
         proxy_url: str = None,
@@ -18,10 +22,13 @@ def __init__(
             additional_headers = {}
         if base_urls is None:
             base_urls = BaseUrls()
+        if network_client is None:
+            network_client = BoxNetworkClient()
         self.requests_session = requests.Session()
         self.additional_headers = additional_headers
         self.base_urls = base_urls
         self.proxy_url = proxy_url
+        self.network_client = network_client
 
         proxies = {'http': proxy_url, 'https': proxy_url} if proxy_url else {}
         self.requests_session.proxies = proxies
@@ -36,9 +43,10 @@ def with_additional_headers(
         :return: a new instance of NetworkSession
         """
         return NetworkSession(
-            {**self.additional_headers, **additional_headers},
-            self.base_urls,
-            self.proxy_url,
+            network_client=self.network_client,
+            additional_headers={**self.additional_headers, **additional_headers},
+            base_urls=self.base_urls,
+            proxy_url=self.proxy_url,
         )
 
     def with_custom_base_urls(self, base_urls: BaseUrls) -> 'NetworkSession':
@@ -48,7 +56,12 @@ def with_custom_base_urls(self, base_urls: BaseUrls) -> 'NetworkSession':
         :param base_urls: Dict of base urls, which are appended to each API request
         :return: a new instance of NetworkSession
         """
-        return NetworkSession(self.additional_headers, base_urls, self.proxy_url)
+        return NetworkSession(
+            network_client=self.network_client,
+            additional_headers=self.additional_headers,
+            base_urls=base_urls,
+            proxy_url=self.proxy_url,
+        )
 
     def with_proxy(self, config: ProxyConfig) -> 'NetworkSession':
         """
@@ -67,4 +80,23 @@ def with_proxy(self, config: ProxyConfig) -> 'NetworkSession':
             else ''
         )
         proxy_url = f'http://{proxy_auth}{proxy_host}'
-        return NetworkSession(self.additional_headers, self.base_urls, proxy_url)
+        return NetworkSession(
+            network_client=self.network_client,
+            additional_headers=self.additional_headers,
+            base_urls=self.base_urls,
+            proxy_url=proxy_url,
+        )
+
+    def with_network_client(self, network_client: NetworkClient) -> 'NetworkSession':
+        """
+        Generate a fresh network session by duplicating the existing configuration and network parameters,
+        while also including a new network client to be used for each API call.
+        :param network_client: NetworkClient object, which contains the fetch method
+        :return: a new instance of NetworkSession
+        """
+        return NetworkSession(
+            network_client=network_client,
+            additional_headers=self.additional_headers,
+            base_urls=self.base_urls,
+            proxy_url=self.proxy_url,
+        )
diff --git a/box_sdk_gen/networking/network_client.py b/box_sdk_gen/networking/network_client.py
new file mode 100644
index 00000000..789354a4
--- /dev/null
+++ b/box_sdk_gen/networking/network_client.py
@@ -0,0 +1,14 @@
+from abc import abstractmethod
+
+from box_sdk_gen.networking.fetch_options import FetchOptions
+
+from box_sdk_gen.networking.fetch_response import FetchResponse
+
+
+class NetworkClient:
+    def __init__(self):
+        pass
+
+    @abstractmethod
+    def fetch(self, options: FetchOptions) -> FetchResponse:
+        pass
diff --git a/docs/authentication.md b/docs/authentication.md
index 006b7356..5f0fd088 100644
--- a/docs/authentication.md
+++ b/docs/authentication.md
@@ -58,7 +58,7 @@ Authenticating with a JWT requires some extra dependencies. To get them, use
 pip install "box-sdk-gen[jwt]"
 ```
 
-Before using JWT Auth make sure you set up correctly your Box App.
+Before using JWT Auth make sure you set up correctly your Box platform app.
 The guide with all required steps can be found here: [Setup with JWT][jwt_guide]
 
 ### Authenticate Enterprise
@@ -154,7 +154,7 @@ user_client = BoxClient(auth=auth)
 
 ## Client Credentials Grant
 
-Before using Client Credentials Grant Auth make sure you set up correctly your Box App.
+Before using Client Credentials Grant Auth make sure you set up correctly your Box platform app.
 The guide with all required steps can be found here: [Setup with Client Credentials Grant][ccg_guide]
 
 Client Credentials Grant Auth method allows you to obtain an access token by having client credentials
diff --git a/test/fetch.py b/test/box_network_client.py
similarity index 84%
rename from test/fetch.py
rename to test/box_network_client.py
index 91684c9a..739d3c66 100644
--- a/test/fetch.py
+++ b/test/box_network_client.py
@@ -13,19 +13,9 @@
     BoxSDKError,
     BoxClient,
 )
-from box_sdk_gen.networking.fetch import (
-    fetch,
-    __prepare_headers,
-    __prepare_body,
-    __prepare_request,
-    __make_request,
-    __raise_on_unsuccessful_request,
-    __get_retry_after_time,
+from box_sdk_gen.networking.box_network_client import (
+    BoxNetworkClient,
     USER_AGENT_HEADER,
-    __get_options_stream_position,
-    __get_multipart_stream_positions,
-    __reset_options_stream,
-    __reset_multipart_streams,
     X_BOX_UA_HEADER,
     APIRequest,
     APIResponse,
@@ -94,6 +84,7 @@ def response_500():
     response = Mock(Response)
     response.url = 'https://example.com'
     response.status_code = 500
+    response.text = ""
     response.ok = False
     response.headers = {"Retry-After": "0"}
     return response
@@ -172,6 +163,11 @@ def network_session_mock(mock_requests_session):
     return network_session
 
 
+@pytest.fixture
+def network_client(mock_requests_session):
+    return BoxNetworkClient(mock_requests_session)
+
+
 def reauthenticate_mock(auth, token):
     auth.retrieve_authorization_header.return_value = f"Bearer {token}"
 
@@ -185,7 +181,7 @@ def authentication_mock(token_mock, token2_mock):
 
 
 def test_use_session_and_max_attempts_from_network_session(
-    network_session_mock, mock_requests_session, response_500
+    network_client, network_session_mock, mock_requests_session, response_500
 ):
     mock_requests_session.request.return_value = response_500
 
@@ -198,25 +194,25 @@ def test_use_session_and_max_attempts_from_network_session(
     )
 
     with pytest.raises(BoxAPIError):
-        fetch(options)
+        network_client.fetch(options)
 
     assert mock_requests_session.request.call_count == 3
 
 
 def test_use_default_session_and_max_attempts_when_network_session_not_provided(
-    mock_requests_session, response_500
+    network_client, mock_requests_session, response_500
 ):
     mock_requests_session.request.return_value = response_500
     with patch("requests.Session", return_value=mock_requests_session):
         options = FetchOptions(url="https://example.com", method="GET")
 
         with pytest.raises(BoxAPIError):
-            fetch(options)
+            network_client.fetch(options)
 
         assert mock_requests_session.request.call_count == 5
 
 
-def test_prepare_headers(authentication_mock, token_mock):
+def test_prepare_headers(network_client, authentication_mock, token_mock):
     network_session = NetworkSession(additional_headers={"additional_header": "test"})
     options = FetchOptions(
         url="https://example.com",
@@ -226,7 +222,7 @@ def test_prepare_headers(authentication_mock, token_mock):
         auth=authentication_mock,
     )
 
-    headers = __prepare_headers(options)
+    headers = network_client._prepare_headers(options)
 
     assert headers == {
         "Authorization": f"Bearer {token_mock}",
@@ -237,7 +233,9 @@ def test_prepare_headers(authentication_mock, token_mock):
     }
 
 
-def test_prepare_headers_reauthenticate(authentication_mock, token2_mock):
+def test_prepare_headers_reauthenticate(
+    network_client, authentication_mock, token2_mock
+):
     network_session = NetworkSession(additional_headers={"additional_header": "test"})
     options = FetchOptions(
         url="https://example.com",
@@ -247,7 +245,7 @@ def test_prepare_headers_reauthenticate(authentication_mock, token2_mock):
         auth=authentication_mock,
     )
 
-    headers = __prepare_headers(options, reauthenticate=True)
+    headers = network_client._prepare_headers(options, reauthenticate=True)
 
     assert headers == {
         "Authorization": f"Bearer {token2_mock}",
@@ -269,18 +267,18 @@ def test_prepare_headers_reauthenticate(authentication_mock, token2_mock):
     ],
 )
 def test_prepare_body_valid_content_type(
-    content_type, data, expected_body, mock_byte_stream
+    network_client, content_type, data, expected_body, mock_byte_stream
 ):
-    body = __prepare_body(content_type, data)
+    body = network_client._prepare_body(content_type, data)
     assert body == expected_body
 
 
-def test_prepare_body_invalid_content_type():
+def test_prepare_body_invalid_content_type(network_client):
     with pytest.raises(Exception):
-        __prepare_body("invalid_content_type", {})
+        network_client._prepare_body("invalid_content_type", {})
 
 
-def test_prepare_json_request():
+def test_prepare_json_request(network_client):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -290,7 +288,7 @@ def test_prepare_json_request():
         content_type="application/json",
     )
 
-    api_request = __prepare_request(options=options)
+    api_request = network_client._prepare_request(options=options)
 
     assert api_request == APIRequest(
         method="POST",
@@ -306,7 +304,7 @@ def test_prepare_json_request():
     )
 
 
-def test_prepare_multipart_request(mock_byte_stream):
+def test_prepare_multipart_request(network_client, mock_byte_stream):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -320,7 +318,7 @@ def test_prepare_multipart_request(mock_byte_stream):
         ],
     )
 
-    api_request = __prepare_request(options=options)
+    api_request = network_client._prepare_request(options=options)
 
     assert api_request.method == "POST"
     assert api_request.url == "https://example.com"
@@ -338,7 +336,7 @@ def test_prepare_multipart_request(mock_byte_stream):
     )
 
 
-def test_make_request(mock_requests_session, response_200):
+def test_make_request(network_client, mock_requests_session, response_200):
     request_params = {
         "method": "POST",
         "url": "https://example.com",
@@ -355,7 +353,7 @@ def test_make_request(mock_requests_session, response_200):
     mock_requests_session.request.return_value = response_200
     api_request = APIRequest(**request_params)
 
-    api_response = __make_request(api_request, mock_requests_session)
+    api_response = network_client._make_request(api_request)
 
     assert api_response == APIResponse(
         network_response=response_200,
@@ -366,12 +364,12 @@ def test_make_request(mock_requests_session, response_200):
     mock_requests_session.request.assert_called_once_with(**request_params, stream=True)
 
 
-def test_make_request_unauthorised(mock_requests_session, response_401):
+def test_make_request_unauthorised(network_client, mock_requests_session, response_401):
     mock_requests_session.request.return_value = response_401
     api_request = APIRequest(
         "GET", "https://example.com", headers={}, params={}, data=""
     )
-    api_response = __make_request(api_request, mock_requests_session)
+    api_response = network_client._make_request(api_request)
 
     assert api_response == APIResponse(
         network_response=response_401,
@@ -396,14 +394,14 @@ def test_make_request_unauthorised(mock_requests_session, response_401):
     ],
 )
 def test_make_request_network_exception(
-    mock_requests_session, exc_message, expected_reauthentication_needed
+    network_client, mock_requests_session, exc_message, expected_reauthentication_needed
 ):
     requests_exception = RequestException(exc_message)
     mock_requests_session.request.side_effect = [requests_exception]
     api_request = APIRequest(
         "GET", "https://example.com", headers={}, params={}, data=""
     )
-    api_response = __make_request(api_request, mock_requests_session)
+    api_response = network_client._make_request(api_request)
 
     assert api_response == APIResponse(
         network_response=None,
@@ -413,13 +411,13 @@ def test_make_request_network_exception(
 
 
 def test_fetch_successfully_retry_network_exception(
-    mock_requests_session, network_session_mock, response_200
+    network_client, mock_requests_session, network_session_mock, response_200
 ):
     requests_exception = RequestException("Connection cancelled")
     mock_requests_session.request.side_effect = [requests_exception, response_200]
 
     with patch("time.sleep"):
-        response = fetch(
+        response = network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -430,14 +428,14 @@ def test_fetch_successfully_retry_network_exception(
 
 
 def test_fetch_make_only_one_retry_for_network_exception(
-    mock_requests_session, network_session_mock
+    network_client, mock_requests_session, network_session_mock
 ):
     requests_exception = RequestException("Connection cancelled")
     mock_requests_session.request.side_effect = [requests_exception, requests_exception]
 
     with patch("time.sleep"):
         with pytest.raises(BoxSDKError, match="Connection cancelled"):
-            fetch(
+            network_client.fetch(
                 FetchOptions(
                     method="get",
                     url="https://example.com",
@@ -449,12 +447,12 @@ def test_fetch_make_only_one_retry_for_network_exception(
 
 
 def test_fetch_get_json_format_response_success(
-    mock_requests_session, network_session_mock, response_200
+    network_client, mock_requests_session, network_session_mock, response_200
 ):
     response_200.text = '{"id": "123456"}'
     mock_requests_session.request.return_value = response_200
 
-    fetch_response = fetch(
+    fetch_response = network_client.fetch(
         FetchOptions(
             method="get",
             url="https://example.com",
@@ -469,13 +467,13 @@ def test_fetch_get_json_format_response_success(
 
 
 def test_fetch_get_binary_format_response_success(
-    mock_requests_session, network_session_mock, response_200
+    network_client, mock_requests_session, network_session_mock, response_200
 ):
     content = b"binary data"
     response_200.iter_content.return_value = BytesIO(content)
     mock_requests_session.request.return_value = response_200
 
-    fetch_response = fetch(
+    fetch_response = network_client.fetch(
         FetchOptions(
             method="get",
             url="https://example.com",
@@ -491,6 +489,7 @@ def test_fetch_get_binary_format_response_success(
 
 @pytest.mark.parametrize("retryable_status_code", [429, 500, 503])
 def test_retryable_status_codes(
+    network_client,
     mock_requests_session,
     network_session_mock,
     response_200,
@@ -505,7 +504,7 @@ def test_retryable_status_codes(
         response_200,
     ]
 
-    fetch_response = fetch(
+    fetch_response = network_client.fetch(
         FetchOptions(
             method="get",
             url="https://example.com",
@@ -518,11 +517,11 @@ def test_retryable_status_codes(
 
 
 def test_status_code_202_with_no_retry_after_header(
-    mock_requests_session, network_session_mock, response_202
+    network_client, mock_requests_session, network_session_mock, response_202
 ):
     mock_requests_session.request.return_value = response_202
 
-    fetch_response = fetch(
+    fetch_response = network_client.fetch(
         FetchOptions(
             method="get",
             url="https://example.com",
@@ -534,6 +533,7 @@ def test_status_code_202_with_no_retry_after_header(
 
 
 def test_retryable_status_code_202(
+    network_client,
     mock_requests_session,
     network_session_mock,
     response_202_with_retry_after,
@@ -548,7 +548,7 @@ def test_retryable_status_code_202(
     ]
 
     with patch("time.sleep"):
-        fetch_response = fetch(
+        fetch_response = network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -562,13 +562,16 @@ def test_retryable_status_code_202(
 
 
 def test_202_should_be_returned_if_retry_limit_is_reached(
-    mock_requests_session, network_session_mock, response_202_with_retry_after
+    network_client,
+    mock_requests_session,
+    network_session_mock,
+    response_202_with_retry_after,
 ):
     network_session_mock.MAX_ATTEMPTS = 5
     mock_requests_session.request.return_value = response_202_with_retry_after
 
     with patch("time.sleep"):
-        fetch_response = fetch(
+        fetch_response = network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -582,6 +585,7 @@ def test_202_should_be_returned_if_retry_limit_is_reached(
 
 @pytest.mark.parametrize("not_retryable_status_code", [404, 403, 400])
 def test_not_retryable_status_codes(
+    network_client,
     mock_requests_session,
     network_session_mock,
     not_retryable_status_code,
@@ -596,7 +600,7 @@ def test_not_retryable_status_codes(
     ]
 
     with pytest.raises(BoxSDKError, match=f"Status code: {not_retryable_status_code}"):
-        fetch(
+        network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -608,6 +612,7 @@ def test_not_retryable_status_codes(
 
 
 def test_retrying_401_response_with_new_token_and_auth_provided(
+    network_client,
     mock_requests_session,
     network_session_mock,
     response_401,
@@ -620,7 +625,7 @@ def test_retrying_401_response_with_new_token_and_auth_provided(
     mock_requests_session.request.side_effect = [response_401, response_200]
 
     with patch("time.sleep"):
-        fetch_response = fetch(
+        fetch_response = network_client.fetch(
             FetchOptions(
                 url="https://example.com",
                 method="GET",
@@ -667,6 +672,7 @@ def test_retrying_401_response_with_new_token_and_auth_provided(
 
 
 def test_not_retrying_401_when_auth_not_provided(
+    network_client,
     mock_requests_session,
     network_session_mock,
     response_401,
@@ -676,7 +682,7 @@ def test_not_retrying_401_when_auth_not_provided(
     mock_requests_session.request.side_effect = [response_401, response_200]
 
     with pytest.raises(BoxSDKError, match="Status code: 401"):
-        fetch(
+        network_client.fetch(
             FetchOptions(
                 url="https://example.com",
                 method="GET",
@@ -701,13 +707,16 @@ def test_not_retrying_401_when_auth_not_provided(
 
 
 def test_reaching_retry_limit(
-    mock_requests_session, network_session_mock, response_202_with_retry_after
+    network_client,
+    mock_requests_session,
+    network_session_mock,
+    response_202_with_retry_after,
 ):
     network_session_mock.MAX_ATTEMPTS = 5
     mock_requests_session.request.return_value = response_202_with_retry_after
 
     with pytest.raises(BoxSDKError, match="Status code: 202"):
-        fetch(
+        network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -718,13 +727,13 @@ def test_reaching_retry_limit(
 
 
 def test_reaching_retry_limit(
-    mock_requests_session, network_session_mock, response_500
+    network_client, mock_requests_session, network_session_mock, response_500
 ):
     network_session_mock.MAX_ATTEMPTS = 5
     mock_requests_session.request.return_value = response_500
 
     with pytest.raises(BoxSDKError, match="Status code: 500"):
-        fetch(
+        network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -734,26 +743,30 @@ def test_reaching_retry_limit(
     assert mock_requests_session.request.call_count == 5
 
 
-def test_get_retry_after_time_use_retry_after_header_value():
+def test_get_retry_after_time_use_retry_after_header_value(network_client):
     for attempt_number in range(1, 5):
-        sleep_time = __get_retry_after_time(attempt_number, "213")
+        sleep_time = network_client._get_retry_after_time(attempt_number, "213")
         assert sleep_time == 213
 
 
-def test_get_retry_after_time_use_exponential_backoff():
+def test_get_retry_after_time_use_exponential_backoff(network_client):
     for attempt_number in range(1, 5):
-        sleep_time = __get_retry_after_time(attempt_number)
+        sleep_time = network_client._get_retry_after_time(attempt_number)
         assert sleep_time > 0
 
 
 def test_pass_retry_after_header_to_get_retry_after_time_method(
-    mock_requests_session, network_session_mock, response_429, response_200
+    network_client,
+    mock_requests_session,
+    network_session_mock,
+    response_429,
+    response_200,
 ):
     response_429.headers = {"Retry-After": "123"}
     mock_requests_session.request.side_effect = [response_429, response_200]
 
     with patch("time.sleep") as sleep_mock:
-        fetch(
+        network_client.fetch(
             FetchOptions(
                 method="get",
                 url="https://example.com",
@@ -764,7 +777,7 @@ def test_pass_retry_after_header_to_get_retry_after_time_method(
         sleep_mock.assert_called_once_with(123)
 
 
-def test_raising_api_error_with_valid_json_body():
+def test_raising_api_error_with_valid_json_body(network_client):
     client_error_response = Mock(Response)
     client_error_response.status_code = 400
     client_error_response.ok = False
@@ -801,7 +814,7 @@ def test_raising_api_error_with_valid_json_body():
         raised_exception=None,
     )
     try:
-        __raise_on_unsuccessful_request(request, response)
+        network_client._raise_on_unsuccessful_request(request, response)
     except BoxAPIError as e:
         assert e.request_info.method == request.method
         assert e.request_info.url == request.url
@@ -834,7 +847,7 @@ def test_raising_api_error_with_valid_json_body():
         assert e.name == "BoxAPIError"
 
 
-def test_raising_api_error_without_valid_json_body():
+def test_raising_api_error_without_valid_json_body(network_client):
     client_error_response = Mock(Response)
     client_error_response.status_code = 400
     client_error_response.ok = False
@@ -863,7 +876,7 @@ def test_raising_api_error_without_valid_json_body():
         raised_exception=None,
     )
     try:
-        __raise_on_unsuccessful_request(request, response)
+        network_client._raise_on_unsuccessful_request(request, response)
     except BoxAPIError as e:
         assert e.request_info.method == request.method
         assert e.request_info.url == request.url
@@ -884,7 +897,7 @@ def test_raising_api_error_without_valid_json_body():
         assert e.name == "BoxAPIError"
 
 
-def test_raising_exception_raised_by_network_layer():
+def test_raising_exception_raised_by_network_layer(network_client):
     requests_exception = RequestException("Something went wrong")
     request = APIRequest(
         method="POST",
@@ -906,7 +919,7 @@ def test_raising_exception_raised_by_network_layer():
     )
 
     try:
-        __raise_on_unsuccessful_request(request, response)
+        network_client._raise_on_unsuccessful_request(request, response)
     except BoxSDKError as e:
         assert e.message == "Something went wrong"
         assert e.error == requests_exception
@@ -923,7 +936,7 @@ def test_proxy_config():
     assert requests_session.proxies["https"] == "http://user:pass@127.0.0.1:3128/"
 
 
-def test_get_options_stream_position(mock_byte_stream):
+def test_get_options_stream_position(network_client, mock_byte_stream):
     mock_byte_stream.seek(1)
     options = FetchOptions(
         url="https://example.com",
@@ -932,10 +945,10 @@ def test_get_options_stream_position(mock_byte_stream):
         file_stream=mock_byte_stream,
     )
 
-    assert __get_options_stream_position(options) == 1
+    assert network_client._get_options_stream_position(options) == 1
 
 
-def test_get_multipart_stream_position(mock_byte_stream):
+def test_get_multipart_stream_position(network_client, mock_byte_stream):
     mock_byte_stream.seek(1)
     options = FetchOptions(
         url="https://example.com",
@@ -950,10 +963,10 @@ def test_get_multipart_stream_position(mock_byte_stream):
         ],
     )
 
-    assert __get_multipart_stream_positions(options) == {"file": 1}
+    assert network_client._get_multipart_stream_positions(options) == {"file": 1}
 
 
-def test_get_multipart_stream_position_empty():
+def test_get_multipart_stream_position_empty(network_client):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -964,10 +977,10 @@ def test_get_multipart_stream_position_empty():
         ],
     )
 
-    assert __get_multipart_stream_positions(options) == {}
+    assert network_client._get_multipart_stream_positions(options) == {}
 
 
-def test_reset_options_stream(mock_byte_stream):
+def test_reset_options_stream(network_client, mock_byte_stream):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -977,15 +990,17 @@ def test_reset_options_stream(mock_byte_stream):
     )
 
     mock_byte_stream.seek(1)
-    original_position = __get_options_stream_position(options)
+    original_position = network_client._get_options_stream_position(options)
     mock_byte_stream.seek(2)
 
-    __reset_options_stream(options, original_position, None)
+    network_client._reset_options_stream(options, original_position, None)
 
     assert options.file_stream.tell() == 1
 
 
-def test_reset_options_stream_non_seekable_stream(mock_non_seekable_stream):
+def test_reset_options_stream_non_seekable_stream(
+    network_client, mock_non_seekable_stream
+):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -994,13 +1009,13 @@ def test_reset_options_stream_non_seekable_stream(mock_non_seekable_stream):
         file_stream=mock_non_seekable_stream,
     )
 
-    original_position = __get_options_stream_position(options)
+    original_position = network_client._get_options_stream_position(options)
 
     with pytest.raises(BoxSDKError):
-        __reset_options_stream(options, original_position, None)
+        network_client._reset_options_stream(options, original_position, None)
 
 
-def test_reset_multipart_stream(mock_byte_stream):
+def test_reset_multipart_stream(network_client, mock_byte_stream):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -1015,15 +1030,15 @@ def test_reset_multipart_stream(mock_byte_stream):
     )
 
     mock_byte_stream.seek(1)
-    original_positions = __get_multipart_stream_positions(options)
+    original_positions = network_client._get_multipart_stream_positions(options)
     mock_byte_stream.seek(2)
 
-    __reset_multipart_streams(options, original_positions, None)
+    network_client._reset_multipart_streams(options, original_positions, None)
 
     assert options.multipart_data[1].file_stream.tell() == 1
 
 
-def test_reset_multipart_non_seekable_stream(mock_non_seekable_stream):
+def test_reset_multipart_non_seekable_stream(network_client, mock_non_seekable_stream):
     options = FetchOptions(
         url="https://example.com",
         method="POST",
@@ -1039,18 +1054,22 @@ def test_reset_multipart_non_seekable_stream(mock_non_seekable_stream):
         ],
     )
 
-    original_positions = __get_multipart_stream_positions(options)
+    original_positions = network_client._get_multipart_stream_positions(options)
 
     with pytest.raises(BoxSDKError):
-        __reset_multipart_streams(options, original_positions, None)
+        network_client._reset_multipart_streams(options, original_positions, None)
 
 
 def test_disable_follow_redirects(
-    mock_requests_session, network_session_mock, response_302, response_200
+    network_client,
+    mock_requests_session,
+    network_session_mock,
+    response_302,
+    response_200,
 ):
     mock_requests_session.request.side_effect = [response_302, response_200]
 
-    fetch(
+    network_client.fetch(
         FetchOptions(
             url="https://example.com",
             method="GET",