Fix up "checkout-cache" a bit