Back out no-cache tests until we're ready for it