Added support for caching + using cache on base settings