Fix settings caching