Fixed caching of settings