Merge "Accounts: Fix TokenCache maps access"