diff --git a/apps/cli/src/context.ts b/apps/cli/src/context.ts
index d3ae6cac..413a91d9 100644
--- a/apps/cli/src/context.ts
+++ b/apps/cli/src/context.ts
@@ -2,9 +2,14 @@ import drizzle from "./drizzle";
 import sqliteKv from "sqliteKv";
 import { createBidirectionalResolver, createIdResolver } from "lib/idResolver";
 import { createStorage } from "unstorage";
+import envpaths from "env-paths";
+import fs from "node:fs";
+
+fs.mkdirSync(envpaths("rocksky", { suffix: "" }).data, { recursive: true });
+const kvPath = `${envpaths("rocksky", { suffix: "" }).data}/rocksky-kv.sqlite`;
 
 const kv = createStorage({
-  driver: sqliteKv({ location: ":memory:", table: "kv" }),
+  driver: sqliteKv({ location: kvPath, table: "kv" }),
 });
 
 const baseIdResolver = createIdResolver(kv);
@@ -13,6 +18,7 @@ export const ctx = {
   db: drizzle.db,
   resolver: createBidirectionalResolver(baseIdResolver),
   baseIdResolver,
+  kv,
 };
 
 export type Context = typeof ctx;
diff --git a/apps/cli/src/lib/matchTrack.ts b/apps/cli/src/lib/matchTrack.ts
index d93ba8b7..5c8de613 100644
--- a/apps/cli/src/lib/matchTrack.ts
+++ b/apps/cli/src/lib/matchTrack.ts
@@ -1,8 +1,6 @@
 import { RockskyClient } from "client";
 import { ctx } from "context";
-import { eq, and, or } from "drizzle-orm";
 import { logger } from "logger";
-import schema from "schema";
 import { SelectTrack } from "schema/tracks";
 
 export type MatchTrackResult = SelectTrack & {
@@ -16,47 +14,22 @@ export async function matchTrack(
   track: string,
   artist: string,
 ): Promise<MatchTrackResult | null> {
-  const [result] = await ctx.db
-    .select()
-    .from(schema.tracks)
-    .leftJoin(
-      schema.albumTracks,
-      eq(schema.albumTracks.trackId, schema.tracks.id),
-    )
-    .leftJoin(schema.albums, eq(schema.albumTracks.albumId, schema.albums.id))
-    .leftJoin(
-      schema.artistAlbums,
-      eq(schema.artistAlbums.albumId, schema.albums.id),
-    )
-    .leftJoin(
-      schema.artists,
-      eq(schema.artistAlbums.artistId, schema.artists.id),
-    )
-    .where(
-      or(
-        and(eq(schema.tracks.title, track), eq(schema.tracks.artist, artist)),
-        and(
-          eq(schema.tracks.title, track),
-          eq(schema.tracks.albumArtist, artist),
-        ),
-      ),
-    )
-    .execute();
+  let match;
+  const cached = await ctx.kv.getItem(`${track} - ${artist}`);
+  const client = new RockskyClient();
 
-  let match = null;
-
-  if (result) {
-    match = {
-      ...result.tracks,
-      genres: result.artists?.genres,
-      artistPicture: result.artists?.picture,
-      releaseDate: result.albums?.releaseDate,
-      year: result.albums?.year,
-    };
+  if (cached) {
+    match = cached;
+    client.matchSong(track, artist).then((newMatch) => {
+      if (newMatch) {
+        ctx.kv.setItem(`${track} - ${artist}`, newMatch);
+      }
+    });
   } else {
-    const client = new RockskyClient();
     match = await client.matchSong(track, artist);
+    await ctx.kv.setItem(`${track} - ${artist}`, match);
   }
+
   logger.info`>> matchTrack ${track}, ${artist}`;
   logger.info`${match}`;