Fixed problematic cache tests.