Merge "Removes stack allocation of token_cache"