diff --git a/oauth/get_token_context.go b/oauth/get_token_context.go
index eeea46ef..8b452ead 100644
--- a/oauth/get_token_context.go
+++ b/oauth/get_token_context.go
@@ -33,14 +33,13 @@ func sendAccTokenReq(
 ) (oauth2.TokenSource, *models.ProblemDetails, error) {
 	var client *AccessToken.APIClient
 
-	configuration := AccessToken.NewConfiguration()
-	configuration.SetBasePath(nrfUri)
-
-	if val, ok := clientMap.Load(configuration); ok {
+	if val, ok := clientMap.Load(nrfUri); ok {
 		client = val.(*AccessToken.APIClient)
 	} else {
+		configuration := AccessToken.NewConfiguration()
+		configuration.SetBasePath(nrfUri)
 		client = AccessToken.NewAPIClient(configuration)
-		clientMap.Store(configuration, client)
+		clientMap.Store(nrfUri, client)
 	}
 
 	var tok models.NrfAccessTokenAccessTokenRsp