Remove deprecated cache config pairs and adjust tests.