diff --git a/src/StackHCI/Az.StackHCI.psm1 b/src/StackHCI/Az.StackHCI.psm1
index 4c8f8201d64c..fb30e82c2925 100644
--- a/src/StackHCI/Az.StackHCI.psm1
+++ b/src/StackHCI/Az.StackHCI.psm1
@@ -197,7 +197,9 @@ param(
         $graphTokenItemResource = $GraphEndpointResourceIdAzurePPE
     }
 
-    $graphTokenItem = [Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance.TokenCache.ReadItems() | where { ($_.TenantId -eq "$TenantId") -and ($_.Resource -eq "$graphTokenItemResource")} | Sort-Object -Property ExpiresOn | Select-Object -Last 1
+    $authFactory = [Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance.AuthenticationFactory
+    $azContext = Get-AzContext
+    $graphTokenItem = $authFactory.Authenticate($azContext.Account, $azContext.Environment, $azContext.Tenant.Id, $null, [Microsoft.Azure.Commands.Common.Authentication.ShowDialog]::Never, $null, $graphTokenItemResource)
     return $graphTokenItem.AccessToken
 }
 
diff --git a/src/StackHCI/ChangeLog.md b/src/StackHCI/ChangeLog.md
index ba62741fd771..8c19cf4fe922 100644
--- a/src/StackHCI/ChangeLog.md
+++ b/src/StackHCI/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Workaround for the token cache issue in Az.Accounts 2.1.0. Using AuthenticationFactory.
 
 ## Version 0.3.0
 * Get the App Roles assigned correctly in case of Stack HCI registration using WAC token.