Issue 973441 5

We should also remove `MockSettingsCache`.