Adding the system cache changes here.