Remove token caching, fix minor issues