Revert .cache dir handling