updated caching and badges