Fix uses of #cache_dir