promptfoo 0.121.5 → 0.121.7

package/dist/src/{cache-DGg-yTZG.cjs → cache-CPGUA4Yl.cjs}

@@ -1,9 +1,11 @@
-const require_logger = require("./logger-COuQb2xB.cjs");
-const require_fetch = require("./fetch-NuqXW1Xb.cjs");
+const require_rolldown_runtime = require("./rolldown-runtime-D_mwlA32.cjs");
+const require_logger = require("./logger-cfNpzI4o.cjs");
+const require_fetch = require("./fetch-Dw4XZHjj.cjs");
+const require_createHash = require("./createHash-CSiqnK5P.cjs");
 let fs = require("fs");
-fs = require_logger.__toESM(fs);
+fs = require_rolldown_runtime.__toESM(fs, 1);
 let path = require("path");
-path = require_logger.__toESM(path);
+path = require_rolldown_runtime.__toESM(path, 1);
 let node_async_hooks = require("node:async_hooks");
 let cache_manager = require("cache-manager");
 let keyv = require("keyv");
@@ -41,12 +43,13 @@ function isTransientConnectionError(error) {
 }
 //#endregion
 //#region src/cache.ts
-var cache_exports = /* @__PURE__ */ require_logger.__exportAll({
+var cache_exports = /* @__PURE__ */ require_rolldown_runtime.__exportAll({
 	clearCache: () => clearCache,
 	disableCache: () => disableCache,
 	enableCache: () => enableCache,
 	fetchWithCache: () => fetchWithCache,
 	getCache: () => getCache,
+	getScopedCacheKey: () => getScopedCacheKey,
 	isCacheEnabled: () => isCacheEnabled,
 	withCacheNamespace: () => withCacheNamespace
 });
@@ -162,6 +165,120 @@ function withCacheNamespace(namespace, fn) {
 	return cacheNamespaceStorage.run({ namespace: scopedNamespace }, fn);
 }
 const inflightFetchResponses = /* @__PURE__ */ new Map();
+const IGNORED_FETCH_CACHE_OPTION_KEYS = new Set(["method", "signal"]);
+const abortSignalIds = /* @__PURE__ */ new WeakMap();
+let nextAbortSignalId = 0;
+function getHeadersForCacheKey(url, options) {
+	const headers = new Headers(require_fetch.getFetchWithProxyHeaders(url, options));
+	if (require_fetch.isPromptfooCloudApiHost(url)) {
+		const token = require_fetch.cloudConfig.getApiKey();
+		if (token) headers.set("Authorization", `Bearer ${token}`);
+	}
+	return Array.from(headers.entries()).sort(([nameA, valueA], [nameB, valueB]) => {
+		const nameComparison = nameA.localeCompare(nameB);
+		return nameComparison === 0 ? valueA.localeCompare(valueB) : nameComparison;
+	});
+}
+function hashFetchCacheKey(identity) {
+	return require_createHash.sha256(JSON.stringify(identity));
+}
+function hashBytesForCacheKey(bytes) {
+	const buffer = ArrayBuffer.isView(bytes) ? Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength) : Buffer.from(bytes);
+	return {
+		byteLength: buffer.byteLength,
+		sha256: require_createHash.sha256(buffer)
+	};
+}
+function getBodyForFetchCacheKey(body) {
+	if (body == null) return {
+		cacheable: true,
+		identity: void 0
+	};
+	if (typeof body === "string") return {
+		cacheable: true,
+		identity: {
+			type: "string",
+			value: body
+		}
+	};
+	if (typeof URLSearchParams !== "undefined" && body instanceof URLSearchParams) return {
+		cacheable: true,
+		identity: {
+			type: "url-search-params",
+			value: body.toString()
+		}
+	};
+	if (body instanceof ArrayBuffer) return {
+		cacheable: true,
+		identity: {
+			type: "array-buffer",
+			...hashBytesForCacheKey(body)
+		}
+	};
+	if (ArrayBuffer.isView(body)) return {
+		cacheable: true,
+		identity: {
+			type: body.constructor.name,
+			...hashBytesForCacheKey(body)
+		}
+	};
+	return {
+		cacheable: false,
+		identity: void 0
+	};
+}
+function getOptionsForFetchCacheKey(options, bodyIdentity) {
+	const identity = {};
+	for (const [key, value] of Object.entries(options).sort(([keyA], [keyB]) => keyA.localeCompare(keyB))) {
+		if (key === "headers" || IGNORED_FETCH_CACHE_OPTION_KEYS.has(key)) continue;
+		if (key === "body") {
+			identity.body = bodyIdentity;
+			continue;
+		}
+		if (value == null || [
+			"boolean",
+			"number",
+			"string"
+		].includes(typeof value)) {
+			identity[key] = value;
+			continue;
+		}
+		return {
+			cacheable: false,
+			identity: void 0
+		};
+	}
+	if (!Object.prototype.hasOwnProperty.call(options, "body") && bodyIdentity !== void 0) identity.body = bodyIdentity;
+	return {
+		cacheable: true,
+		identity
+	};
+}
+function getFetchCacheKey(url, options, method, format) {
+	const bodyForCacheKey = getBodyForFetchCacheKey(options.body ?? (url instanceof Request ? url.body : void 0));
+	if (!bodyForCacheKey.cacheable) return null;
+	const optionsForCacheKey = getOptionsForFetchCacheKey(options, bodyForCacheKey.identity);
+	if (!optionsForCacheKey.cacheable) return null;
+	return getScopedCacheKey(`fetch:v3:${hashFetchCacheKey({
+		format,
+		headers: getHeadersForCacheKey(url, options),
+		method,
+		options: optionsForCacheKey.identity,
+		url: url instanceof Request ? url.url : String(url)
+	})}`);
+}
+function getAbortSignalId(signal) {
+	let signalId = abortSignalIds.get(signal);
+	if (signalId === void 0) {
+		signalId = ++nextAbortSignalId;
+		abortSignalIds.set(signal, signalId);
+	}
+	return signalId;
+}
+function getInflightFetchCacheKey(cacheKey, url, options) {
+	const signal = options.signal ?? (url instanceof Request ? url.signal : void 0);
+	return signal ? `${cacheKey}:signal:${getAbortSignalId(signal)}` : cacheKey;
+}
 function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
 	return JSON.stringify({
 		data,
@@ -253,7 +370,8 @@ async function fetchWithCache(url, options = {}, timeout = require_fetch.REQUEST
 		"PUT",
 		"DELETE"
 	].includes(method);
-	if (!enabled || bust) {
+	const cacheKey = enabled && !bust ? getFetchCacheKey(url, options, method, format) : null;
+	if (!enabled || bust || cacheKey == null) {
 		const { respText, resp, fetchLatencyMs } = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
 		try {
 			return {
@@ -269,25 +387,23 @@ async function fetchWithCache(url, options = {}, timeout = require_fetch.REQUEST
 			throw new Error(`Error parsing response as JSON: ${respText}`);
 		}
 	}
-	const copy = Object.assign({}, options);
-	delete copy.headers;
-	const cacheKey = getScopedCacheKey(`fetch:v2:${url}:${JSON.stringify(copy)}`);
 	const cache = getCacheInstance();
 	const cachedResponse = await cache.get(cacheKey);
 	if (cachedResponse != null) {
 		require_logger.logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
 		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
 	}
-	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	const inflightCacheKey = getInflightFetchCacheKey(cacheKey, url, options);
+	let inflightResponse = inflightFetchResponses.get(inflightCacheKey);
 	if (!inflightResponse) {
 		inflightResponse = (async () => {
 			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
 			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
 			return preparedResponse.response;
 		})().finally(() => {
-			inflightFetchResponses.delete(cacheKey);
+			inflightFetchResponses.delete(inflightCacheKey);
 		});
-		inflightFetchResponses.set(cacheKey, inflightResponse);
+		inflightFetchResponses.set(inflightCacheKey, inflightResponse);
 	}
 	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
@@ -318,24 +434,12 @@ Object.defineProperty(exports, "cache_exports", {
 		return cache_exports;
 	}
 });
-Object.defineProperty(exports, "clearCache", {
-	enumerable: true,
-	get: function() {
-		return clearCache;
-	}
-});
 Object.defineProperty(exports, "disableCache", {
 	enumerable: true,
 	get: function() {
 		return disableCache;
 	}
 });
-Object.defineProperty(exports, "enableCache", {
-	enumerable: true,
-	get: function() {
-		return enableCache;
-	}
-});
 Object.defineProperty(exports, "fetchWithCache", {
 	enumerable: true,
 	get: function() {
@@ -348,6 +452,12 @@ Object.defineProperty(exports, "getCache", {
 		return getCache;
 	}
 });
+Object.defineProperty(exports, "getScopedCacheKey", {
+	enumerable: true,
+	get: function() {
+		return getScopedCacheKey;
+	}
+});
 Object.defineProperty(exports, "isCacheEnabled", {
 	enumerable: true,
 	get: function() {
@@ -373,4 +483,4 @@ Object.defineProperty(exports, "withCacheNamespace", {
 	}
 });
 
-//# sourceMappingURL=cache-DGg-yTZG.cjs.map
+//# sourceMappingURL=cache-CPGUA4Yl.cjs.map

package/dist/src/cache-Cf7b4pWE.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import { c as isCacheEnabled, o as getCache } from "./cache-DpPWrkTE.js";
+export { getCache, isCacheEnabled };

package/dist/src/{cache-Bzttsk0X.js → cache-DIXbtkNO.js}

@@ -1,6 +1,7 @@
 import { t as __exportAll } from "./chunk-DEq-mXcV.js";
 import { S as getEnvBool, T as getEnvString, a as logger, w as getEnvInt, x as getConfigDirectoryPath } from "./logger-Ct2S6Yx-.js";
-import { n as fetchWithRetries, o as sleep, u as REQUEST_TIMEOUT_MS } from "./fetch-D9xxyC1p.js";
+import { T as cloudConfig, a as getFetchWithProxyHeaders, l as sleep, n as fetchWithRetries, p as REQUEST_TIMEOUT_MS, s as isPromptfooCloudApiHost } from "./fetch-It34O8Ur.js";
+import { n as sha256 } from "./createHash-BtbSX3mj.js";
 import fs from "fs";
 import path from "path";
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -46,6 +47,7 @@ var cache_exports = /* @__PURE__ */ __exportAll({
 	enableCache: () => enableCache,
 	fetchWithCache: () => fetchWithCache,
 	getCache: () => getCache,
+	getScopedCacheKey: () => getScopedCacheKey,
 	isCacheEnabled: () => isCacheEnabled,
 	withCacheNamespace: () => withCacheNamespace
 });
@@ -161,6 +163,120 @@ function withCacheNamespace(namespace, fn) {
 	return cacheNamespaceStorage.run({ namespace: scopedNamespace }, fn);
 }
 const inflightFetchResponses = /* @__PURE__ */ new Map();
+const IGNORED_FETCH_CACHE_OPTION_KEYS = new Set(["method", "signal"]);
+const abortSignalIds = /* @__PURE__ */ new WeakMap();
+let nextAbortSignalId = 0;
+function getHeadersForCacheKey(url, options) {
+	const headers = new Headers(getFetchWithProxyHeaders(url, options));
+	if (isPromptfooCloudApiHost(url)) {
+		const token = cloudConfig.getApiKey();
+		if (token) headers.set("Authorization", `Bearer ${token}`);
+	}
+	return Array.from(headers.entries()).sort(([nameA, valueA], [nameB, valueB]) => {
+		const nameComparison = nameA.localeCompare(nameB);
+		return nameComparison === 0 ? valueA.localeCompare(valueB) : nameComparison;
+	});
+}
+function hashFetchCacheKey(identity) {
+	return sha256(JSON.stringify(identity));
+}
+function hashBytesForCacheKey(bytes) {
+	const buffer = ArrayBuffer.isView(bytes) ? Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength) : Buffer.from(bytes);
+	return {
+		byteLength: buffer.byteLength,
+		sha256: sha256(buffer)
+	};
+}
+function getBodyForFetchCacheKey(body) {
+	if (body == null) return {
+		cacheable: true,
+		identity: void 0
+	};
+	if (typeof body === "string") return {
+		cacheable: true,
+		identity: {
+			type: "string",
+			value: body
+		}
+	};
+	if (typeof URLSearchParams !== "undefined" && body instanceof URLSearchParams) return {
+		cacheable: true,
+		identity: {
+			type: "url-search-params",
+			value: body.toString()
+		}
+	};
+	if (body instanceof ArrayBuffer) return {
+		cacheable: true,
+		identity: {
+			type: "array-buffer",
+			...hashBytesForCacheKey(body)
+		}
+	};
+	if (ArrayBuffer.isView(body)) return {
+		cacheable: true,
+		identity: {
+			type: body.constructor.name,
+			...hashBytesForCacheKey(body)
+		}
+	};
+	return {
+		cacheable: false,
+		identity: void 0
+	};
+}
+function getOptionsForFetchCacheKey(options, bodyIdentity) {
+	const identity = {};
+	for (const [key, value] of Object.entries(options).sort(([keyA], [keyB]) => keyA.localeCompare(keyB))) {
+		if (key === "headers" || IGNORED_FETCH_CACHE_OPTION_KEYS.has(key)) continue;
+		if (key === "body") {
+			identity.body = bodyIdentity;
+			continue;
+		}
+		if (value == null || [
+			"boolean",
+			"number",
+			"string"
+		].includes(typeof value)) {
+			identity[key] = value;
+			continue;
+		}
+		return {
+			cacheable: false,
+			identity: void 0
+		};
+	}
+	if (!Object.prototype.hasOwnProperty.call(options, "body") && bodyIdentity !== void 0) identity.body = bodyIdentity;
+	return {
+		cacheable: true,
+		identity
+	};
+}
+function getFetchCacheKey(url, options, method, format) {
+	const bodyForCacheKey = getBodyForFetchCacheKey(options.body ?? (url instanceof Request ? url.body : void 0));
+	if (!bodyForCacheKey.cacheable) return null;
+	const optionsForCacheKey = getOptionsForFetchCacheKey(options, bodyForCacheKey.identity);
+	if (!optionsForCacheKey.cacheable) return null;
+	return getScopedCacheKey(`fetch:v3:${hashFetchCacheKey({
+		format,
+		headers: getHeadersForCacheKey(url, options),
+		method,
+		options: optionsForCacheKey.identity,
+		url: url instanceof Request ? url.url : String(url)
+	})}`);
+}
+function getAbortSignalId(signal) {
+	let signalId = abortSignalIds.get(signal);
+	if (signalId === void 0) {
+		signalId = ++nextAbortSignalId;
+		abortSignalIds.set(signal, signalId);
+	}
+	return signalId;
+}
+function getInflightFetchCacheKey(cacheKey, url, options) {
+	const signal = options.signal ?? (url instanceof Request ? url.signal : void 0);
+	return signal ? `${cacheKey}:signal:${getAbortSignalId(signal)}` : cacheKey;
+}
 function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
 	return JSON.stringify({
 		data,
@@ -252,7 +368,8 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 		"PUT",
 		"DELETE"
 	].includes(method);
-	if (!enabled || bust) {
+	const cacheKey = enabled && !bust ? getFetchCacheKey(url, options, method, format) : null;
+	if (!enabled || bust || cacheKey == null) {
 		const { respText, resp, fetchLatencyMs } = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
 		try {
 			return {
@@ -268,25 +385,23 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 			throw new Error(`Error parsing response as JSON: ${respText}`);
 		}
 	}
-	const copy = Object.assign({}, options);
-	delete copy.headers;
-	const cacheKey = getScopedCacheKey(`fetch:v2:${url}:${JSON.stringify(copy)}`);
 	const cache = getCacheInstance();
 	const cachedResponse = await cache.get(cacheKey);
 	if (cachedResponse != null) {
 		logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
 		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
 	}
-	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	const inflightCacheKey = getInflightFetchCacheKey(cacheKey, url, options);
+	let inflightResponse = inflightFetchResponses.get(inflightCacheKey);
 	if (!inflightResponse) {
 		inflightResponse = (async () => {
 			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
 			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
 			return preparedResponse.response;
 		})().finally(() => {
-			inflightFetchResponses.delete(cacheKey);
+			inflightFetchResponses.delete(inflightCacheKey);
 		});
-		inflightFetchResponses.set(cacheKey, inflightResponse);
+		inflightFetchResponses.set(inflightCacheKey, inflightResponse);
 	}
 	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
@@ -305,6 +420,6 @@ function isCacheEnabled() {
 	return enabled;
 }
 //#endregion
-export { isCacheEnabled as a, isNonTransientHttpStatus as c, getCache as i, isTransientConnectionError as l, disableCache as n, withCacheNamespace as o, fetchWithCache as r, NON_TRANSIENT_HTTP_STATUSES as s, cache_exports as t };
+export { getScopedCacheKey as a, NON_TRANSIENT_HTTP_STATUSES as c, getCache as i, isNonTransientHttpStatus as l, disableCache as n, isCacheEnabled as o, fetchWithCache as r, withCacheNamespace as s, cache_exports as t, isTransientConnectionError as u };
 
-//# sourceMappingURL=cache-Bzttsk0X.js.map
+//# sourceMappingURL=cache-DIXbtkNO.js.map

package/dist/src/{cache-BI5BY7ey.js → cache-DpPWrkTE.js}

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 import { t as __exportAll } from "./chunk-DRamLcfz.js";
 import { C as getConfigDirectoryPath, D as getEnvInt, O as getEnvString, T as getEnvBool, s as logger } from "./logger-BbY6ypFL.js";
-import { l as sleep, m as REQUEST_TIMEOUT_MS, r as fetchWithRetries } from "./fetch-B6ch2nU2.js";
-import { r as isTransientConnectionError } from "./errors-DFHe4L-n.js";
+import { _ as REQUEST_TIMEOUT_MS, a as getFetchWithProxyHeaders, f as sleep, r as fetchWithRetries, u as isPromptfooCloudApiHost } from "./fetch-DXUnXkVU.js";
+import { a as cloudConfig } from "./cloud-D3DiFqH6.js";
+import { n as sha256 } from "./createHash-CgRvs4Fn.js";
+import { r as isTransientConnectionError } from "./errors-9PcUL8BC.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import fs from "fs";
 import path from "path";
@@ -16,6 +18,7 @@ var cache_exports = /* @__PURE__ */ __exportAll({
 	enableCache: () => enableCache,
 	fetchWithCache: () => fetchWithCache,
 	getCache: () => getCache,
+	getScopedCacheKey: () => getScopedCacheKey,
 	isCacheEnabled: () => isCacheEnabled,
 	withCacheNamespace: () => withCacheNamespace
 });
@@ -131,6 +134,120 @@ function withCacheNamespace(namespace, fn) {
 	return cacheNamespaceStorage.run({ namespace: scopedNamespace }, fn);
 }
 const inflightFetchResponses = /* @__PURE__ */ new Map();
+const IGNORED_FETCH_CACHE_OPTION_KEYS = new Set(["method", "signal"]);
+const abortSignalIds = /* @__PURE__ */ new WeakMap();
+let nextAbortSignalId = 0;
+function getHeadersForCacheKey(url, options) {
+	const headers = new Headers(getFetchWithProxyHeaders(url, options));
+	if (isPromptfooCloudApiHost(url)) {
+		const token = cloudConfig.getApiKey();
+		if (token) headers.set("Authorization", `Bearer ${token}`);
+	}
+	return Array.from(headers.entries()).sort(([nameA, valueA], [nameB, valueB]) => {
+		const nameComparison = nameA.localeCompare(nameB);
+		return nameComparison === 0 ? valueA.localeCompare(valueB) : nameComparison;
+	});
+}
+function hashFetchCacheKey(identity) {
+	return sha256(JSON.stringify(identity));
+}
+function hashBytesForCacheKey(bytes) {
+	const buffer = ArrayBuffer.isView(bytes) ? Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength) : Buffer.from(bytes);
+	return {
+		byteLength: buffer.byteLength,
+		sha256: sha256(buffer)
+	};
+}
+function getBodyForFetchCacheKey(body) {
+	if (body == null) return {
+		cacheable: true,
+		identity: void 0
+	};
+	if (typeof body === "string") return {
+		cacheable: true,
+		identity: {
+			type: "string",
+			value: body
+		}
+	};
+	if (typeof URLSearchParams !== "undefined" && body instanceof URLSearchParams) return {
+		cacheable: true,
+		identity: {
+			type: "url-search-params",
+			value: body.toString()
+		}
+	};
+	if (body instanceof ArrayBuffer) return {
+		cacheable: true,
+		identity: {
+			type: "array-buffer",
+			...hashBytesForCacheKey(body)
+		}
+	};
+	if (ArrayBuffer.isView(body)) return {
+		cacheable: true,
+		identity: {
+			type: body.constructor.name,
+			...hashBytesForCacheKey(body)
+		}
+	};
+	return {
+		cacheable: false,
+		identity: void 0
+	};
+}
+function getOptionsForFetchCacheKey(options, bodyIdentity) {
+	const identity = {};
+	for (const [key, value] of Object.entries(options).sort(([keyA], [keyB]) => keyA.localeCompare(keyB))) {
+		if (key === "headers" || IGNORED_FETCH_CACHE_OPTION_KEYS.has(key)) continue;
+		if (key === "body") {
+			identity.body = bodyIdentity;
+			continue;
+		}
+		if (value == null || [
+			"boolean",
+			"number",
+			"string"
+		].includes(typeof value)) {
+			identity[key] = value;
+			continue;
+		}
+		return {
+			cacheable: false,
+			identity: void 0
+		};
+	}
+	if (!Object.prototype.hasOwnProperty.call(options, "body") && bodyIdentity !== void 0) identity.body = bodyIdentity;
+	return {
+		cacheable: true,
+		identity
+	};
+}
+function getFetchCacheKey(url, options, method, format) {
+	const bodyForCacheKey = getBodyForFetchCacheKey(options.body ?? (url instanceof Request ? url.body : void 0));
+	if (!bodyForCacheKey.cacheable) return null;
+	const optionsForCacheKey = getOptionsForFetchCacheKey(options, bodyForCacheKey.identity);
+	if (!optionsForCacheKey.cacheable) return null;
+	return getScopedCacheKey(`fetch:v3:${hashFetchCacheKey({
+		format,
+		headers: getHeadersForCacheKey(url, options),
+		method,
+		options: optionsForCacheKey.identity,
+		url: url instanceof Request ? url.url : String(url)
+	})}`);
+}
+function getAbortSignalId(signal) {
+	let signalId = abortSignalIds.get(signal);
+	if (signalId === void 0) {
+		signalId = ++nextAbortSignalId;
+		abortSignalIds.set(signal, signalId);
+	}
+	return signalId;
+}
+function getInflightFetchCacheKey(cacheKey, url, options) {
+	const signal = options.signal ?? (url instanceof Request ? url.signal : void 0);
+	return signal ? `${cacheKey}:signal:${getAbortSignalId(signal)}` : cacheKey;
+}
 function serializeFetchResponse(data, status, statusText, headers, latencyMs) {
 	return JSON.stringify({
 		data,
@@ -222,7 +339,8 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 		"PUT",
 		"DELETE"
 	].includes(method);
-	if (!enabled || bust) {
+	const cacheKey = enabled && !bust ? getFetchCacheKey(url, options, method, format) : null;
+	if (!enabled || bust || cacheKey == null) {
 		const { respText, resp, fetchLatencyMs } = await fetchAndReadBody(url, options, timeout, maxRetries, isIdempotent);
 		try {
 			return {
@@ -238,25 +356,23 @@ async function fetchWithCache(url, options = {}, timeout = REQUEST_TIMEOUT_MS, f
 			throw new Error(`Error parsing response as JSON: ${respText}`);
 		}
 	}
-	const copy = Object.assign({}, options);
-	delete copy.headers;
-	const cacheKey = getScopedCacheKey(`fetch:v2:${url}:${JSON.stringify(copy)}`);
 	const cache = getCacheInstance();
 	const cachedResponse = await cache.get(cacheKey);
 	if (cachedResponse != null) {
 		logger.debug(`Returning cached response for ${url}: ${cachedResponse}`);
 		return deserializeFetchResponse(cachedResponse, true, cache, cacheKey);
 	}
-	let inflightResponse = inflightFetchResponses.get(cacheKey);
+	const inflightCacheKey = getInflightFetchCacheKey(cacheKey, url, options);
+	let inflightResponse = inflightFetchResponses.get(inflightCacheKey);
 	if (!inflightResponse) {
 		inflightResponse = (async () => {
 			const preparedResponse = await prepareFetchResponse(url, options, timeout, maxRetries, isIdempotent, format);
 			if (preparedResponse.cacheable) await cache.set(cacheKey, preparedResponse.response);
 			return preparedResponse.response;
 		})().finally(() => {
-			inflightFetchResponses.delete(cacheKey);
+			inflightFetchResponses.delete(inflightCacheKey);
 		});
-		inflightFetchResponses.set(cacheKey, inflightResponse);
+		inflightFetchResponses.set(inflightCacheKey, inflightResponse);
 	}
 	return deserializeFetchResponse(await inflightResponse, false, cache, cacheKey);
 }
@@ -275,6 +391,6 @@ function isCacheEnabled() {
 	return enabled;
 }
 //#endregion
-export { fetchWithCache as a, withCacheNamespace as c, enableCache as i, clearCache as n, getCache as o, disableCache as r, isCacheEnabled as s, cache_exports as t };
+export { fetchWithCache as a, isCacheEnabled as c, enableCache as i, withCacheNamespace as l, clearCache as n, getCache as o, disableCache as r, getScopedCacheKey as s, cache_exports as t };
 
-//# sourceMappingURL=cache-BI5BY7ey.js.map
+//# sourceMappingURL=cache-DpPWrkTE.js.map