Better-handle more distcache weirdness.