Merge "Add Cache to Settings access for CompatUI" into main