diff --git a/projects/vdk-control-cli/src/vdk/internal/control/command_groups/login_group/login.py b/projects/vdk-control-cli/src/vdk/internal/control/command_groups/login_group/login.py
index 0df41411e7..edfd490d24 100644
--- a/projects/vdk-control-cli/src/vdk/internal/control/command_groups/login_group/login.py
+++ b/projects/vdk-control-cli/src/vdk/internal/control/command_groups/login_group/login.py
@@ -120,7 +120,6 @@ def login(
                 auth_discovery_url=oauth2_discovery_url,
                 authorization_url=oauth2_exchange_url,
                 auth_type=auth_type,
-                cache_locally=True,
             )
             auth.authenticate()
             click.echo("Login Successful")
@@ -149,7 +148,6 @@ def login(
                 authorization_url=api_token_authorization_url,
                 token=api_token,
                 auth_type=auth_type,
-                cache_locally=True,
             )
             try:
                 apikey_auth.authenticate()
diff --git a/projects/vdk-control-cli/src/vdk/internal/control/rest_lib/factory.py b/projects/vdk-control-cli/src/vdk/internal/control/rest_lib/factory.py
index 285455a077..c3a911b92d 100644
--- a/projects/vdk-control-cli/src/vdk/internal/control/rest_lib/factory.py
+++ b/projects/vdk-control-cli/src/vdk/internal/control/rest_lib/factory.py
@@ -41,7 +41,7 @@ def __init__(self, rest_api_url):
         self.config.client_side_validation = False
         self.config.verify_ssl = self.vdk_config.http_verify_ssl
 
-        auth = Authentication(cache_locally=True)
+        auth = Authentication()
         # For now there's no need to add auto-update since this is called usually in a shell script
         # and each command will have short execution life even when multiple requests to API are made.
         self.config.access_token = auth.read_access_token()
diff --git a/projects/vdk-plugins/airflow-provider-vdk/vdk_provider/hooks/vdk.py b/projects/vdk-plugins/airflow-provider-vdk/vdk_provider/hooks/vdk.py
index 4b5882884b..98fec99d34 100644
--- a/projects/vdk-plugins/airflow-provider-vdk/vdk_provider/hooks/vdk.py
+++ b/projects/vdk-plugins/airflow-provider-vdk/vdk_provider/hooks/vdk.py
@@ -19,8 +19,10 @@
 from taurus_datajob_api import DataJobExecutionRequest
 from taurus_datajob_api import DataJobsExecutionApi
 from urllib3 import Retry
+from vdk.plugin.control_api_auth.auth_config import SingletonInMemoryCredentialsCache
 from vdk.plugin.control_api_auth.authentication import Authentication
 
+
 if sys.version_info >= (3, 8):
     from functools import cached_property
 else:
@@ -248,7 +250,7 @@ def _login(self) -> None:
             token=self.conn.extra_dejson.get("token", None),
             authorization_url=self.conn.extra_dejson.get("auth_server", None),
             auth_type=self.conn.extra_dejson.get("auth_type", None),
-            cache_locally=False,
+            credentials_cache=SingletonInMemoryCredentialsCache(),
         )
         self.auth.authenticate()
 
diff --git a/projects/vdk-plugins/vdk-dag/src/vdk/plugin/dag/remote_data_job.py b/projects/vdk-plugins/vdk-dag/src/vdk/plugin/dag/remote_data_job.py
index 7db062dd05..e637d42861 100644
--- a/projects/vdk-plugins/vdk-dag/src/vdk/plugin/dag/remote_data_job.py
+++ b/projects/vdk-plugins/vdk-dag/src/vdk/plugin/dag/remote_data_job.py
@@ -249,5 +249,5 @@ def _get_access_token(self) -> str:
             return self.auth.read_access_token()
 
     def _login(self) -> None:
-        self.auth = Authentication(cache_locally=True)
+        self.auth = Authentication()
         # self.auth.authenticate()