added caching, general settings