Updated caching and settings