Fix caching token