Revert "Fix settings caching"

This reverts commit cd391e90d8e6c721340fdb7052667a3dc7938b5f.