Merge "Revert "SettingsProvider enhanced cache"" into udc-dev