corrections to caching of token