Code Change:
Split into two methods, one for updating token cache, and one for tenant cache