fighting more test failures from the new Cache ordering