Remove token caching and cloning

Bug: 51203
Change-Id: Ia377d5878ac048bab15dbd42187330bee653c6eb