Fix additional breakage caused by cache-machine upgrade