quick fix for token caching issue