3 files changed, 8 insertions, 4 deletions
diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs
index 547dc379b..41accacba 100644
--- a/cli/tools/fmt.rs
+++ b/cli/tools/fmt.rs
@@ -12,6 +12,7 @@ use crate::args::FilesConfig;
 use crate::args::FmtOptions;
 use crate::args::FmtOptionsConfig;
 use crate::args::ProseWrap;
+use crate::cache::Caches;
 use crate::colors;
 use crate::util::diff::diff;
 use crate::util::file_watcher;
@@ -101,9 +102,10 @@ pub async fn format(
     }
   };
   let deno_dir = &cli_options.resolve_deno_dir()?;
-  let operation = |(paths, fmt_options): (Vec<PathBuf>, FmtOptionsConfig)| async move {
+  let caches = Caches::default();
+  let operation = |(paths, fmt_options): (Vec<PathBuf>, FmtOptionsConfig)| async {
     let incremental_cache = Arc::new(IncrementalCache::new(
-      &deno_dir.fmt_incremental_cache_db_file_path(),
+      caches.fmt_incremental_cache_db(deno_dir),
       &fmt_options,
       &paths,
     ));
diff --git a/cli/tools/lint.rs b/cli/tools/lint.rs
index 821257570..eae2f1032 100644
--- a/cli/tools/lint.rs
+++ b/cli/tools/lint.rs
@@ -11,6 +11,7 @@ use crate::args::FilesConfig;
 use crate::args::LintOptions;
 use crate::args::LintReporterKind;
 use crate::args::LintRulesConfig;
+use crate::cache::Caches;
 use crate::colors;
 use crate::tools::fmt::run_parallelized;
 use crate::util::file_watcher;
@@ -98,9 +99,10 @@ pub async fn lint(
 
   let has_error = Arc::new(AtomicBool::new(false));
   let deno_dir = cli_options.resolve_deno_dir()?;
+  let caches = Caches::default();
   let operation = |paths: Vec<PathBuf>| async {
     let incremental_cache = Arc::new(IncrementalCache::new(
-      &deno_dir.lint_incremental_cache_db_file_path(),
+      caches.lint_incremental_cache_db(&deno_dir),
       // use a hash of the rule names in order to bust the cache
       &{
         // ensure this is stable by sorting it
diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
index bf34fc185..177a80b8a 100644
--- a/cli/tools/vendor/test.rs
+++ b/cli/tools/vendor/test.rs
@@ -218,7 +218,7 @@ impl VendorTestBuilder {
     let output_dir = make_path("/vendor");
     let roots = self.entry_points.clone();
     let loader = self.loader.clone();
-    let parsed_source_cache = ParsedSourceCache::new(None);
+    let parsed_source_cache = ParsedSourceCache::new_in_memory();
     let analyzer = parsed_source_cache.as_analyzer();
     let graph = build_test_graph(
       roots,