Caching and authentication fixes