diff --git a/packages/cli/lib/services/response-saver.service.ts b/packages/cli/lib/services/response-saver.service.ts
index f27ccbf21b9..3b740ca2bbe 100644
--- a/packages/cli/lib/services/response-saver.service.ts
+++ b/packages/cli/lib/services/response-saver.service.ts
@@ -1,38 +1,62 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import type { AxiosResponse } from 'axios';
+import crypto from 'node:crypto';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import type { Connection } from '@nangohq/shared';
 import type { Metadata } from '@nangohq/types';
 
+const FILTER_HEADERS = [
+    'authorization',
+    'user-agent',
+    'nango-proxy-user-agent',
+    'accept-encoding',
+    'retries',
+    'host',
+    'connection-id',
+    'provider-config-key',
+    'nango-is-sync',
+    'nango-is-dry-run',
+    'nango-activity-log-id',
+    'content-type',
+    'accept',
+    'base-url-override'
+];
+
+interface ConfigIdentity {
+    method: string;
+    endpoint: string;
+    requestIdentityHash: string;
+    requestIdentity: RequestIdentity;
+}
+
+interface RequestIdentity {
+    method: string;
+    endpoint: string;
+    params: [string, unknown][];
+    headers: [string, unknown][];
+    data?: unknown;
+}
+
+interface CachedRequest {
+    requestIdentityHash: string;
+    requestIdentity: RequestIdentity;
+    response: unknown;
+    status: number;
+    headers: Record<string, string>;
+}
+
 export function ensureDirectoryExists(directoryName: string): void {
     if (!fs.existsSync(directoryName)) {
         fs.mkdirSync(directoryName, { recursive: true });
     }
 }
 
-function saveResponse<T>({
-    directoryName,
-    data,
-    customFilePath,
-    concatenateIfExists
-}: {
-    directoryName: string;
-    data: T | T[];
-    customFilePath: string;
-    concatenateIfExists: boolean;
-}): void {
+function saveResponse<T>({ directoryName, data, customFilePath }: { directoryName: string; data: T | T[]; customFilePath: string }): void {
     ensureDirectoryExists(`${directoryName}/mocks`);
 
     const filePath = path.join(directoryName, customFilePath);
     ensureDirectoryExists(path.dirname(filePath));
 
-    if (fs.existsSync(filePath)) {
-        const existingData = JSON.parse(fs.readFileSync(filePath, 'utf8'));
-        if (concatenateIfExists && Array.isArray(existingData) && Array.isArray(data)) {
-            data = data.concat(existingData);
-        }
-    }
-
     fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
 }
 
@@ -51,7 +75,6 @@ export function onAxiosRequestFulfilled({
         return response;
     }
     const directoryName = `${process.env['NANGO_MOCKS_RESPONSE_DIRECTORY'] ?? ''}${providerConfigKey}`;
-    const method = response.config.method?.toLowerCase() || 'get';
 
     if (response.request.path.includes(`/connection/${connectionId}?provider_config_key=${providerConfigKey}`)) {
         const connection = response.data as Connection;
@@ -60,35 +83,99 @@ export function onAxiosRequestFulfilled({
         saveResponse<Pick<Connection, 'metadata' | 'connection_config'>>({
             directoryName,
             data: { metadata: connection.metadata as Metadata, connection_config: connection.connection_config },
-            customFilePath: 'mocks/nango/getConnection.json',
-            concatenateIfExists: false
+            customFilePath: 'mocks/nango/getConnection.json'
         });
 
         saveResponse<Metadata>({
             directoryName,
             data: connection.metadata as Metadata,
-            customFilePath: 'mocks/nango/getMetadata.json',
-            concatenateIfExists: false
+            customFilePath: 'mocks/nango/getMetadata.json'
         });
 
         return response;
     }
 
-    const [pathname, params] = response.request.path.split('?');
-    const strippedPath = pathname.replace('/', '');
-
-    let concatenateIfExists = false;
-
-    if (params && params.includes('page')) {
-        concatenateIfExists = true;
-    }
+    const requestIdentity = computeConfigIdentity(response.config);
 
-    saveResponse<AxiosResponse>({
+    saveResponse<CachedRequest>({
         directoryName,
-        data: response.data,
-        customFilePath: `mocks/nango/${method}/${strippedPath}/${syncName}.json`,
-        concatenateIfExists
+        data: {
+            ...requestIdentity,
+            response: response.data,
+            status: response.status,
+            headers: response.headers as Record<string, string>
+        },
+        customFilePath: `mocks/nango/${requestIdentity.method}/proxy/${requestIdentity.endpoint}/${syncName}/${requestIdentity.requestIdentityHash}.json`
     });
 
     return response;
 }
+
+function computeConfigIdentity(config: AxiosRequestConfig): ConfigIdentity {
+    const method = config.method?.toLowerCase() || 'get';
+    const params = sortEntries(Object.entries(config.params || {}));
+
+    const url = new URL(config.url!);
+    const endpoint = url.pathname.replace(/^\/proxy\//, '');
+
+    const dataIdentity = computeDataIdentity(config);
+
+    let headers: [string, string][] = [];
+    if (config.headers !== undefined) {
+        const filteredHeaders = Object.entries(config.headers).filter(([key]) => !FILTER_HEADERS.includes(key.toLowerCase()));
+        sortEntries(filteredHeaders);
+        headers = filteredHeaders;
+    }
+
+    // order is important to the request hash
+    const requestIdentity: RequestIdentity = {
+        method,
+        endpoint,
+        params,
+        headers,
+        data: dataIdentity
+    };
+    const requestIdentityHash = crypto.createHash('sha1').update(JSON.stringify(requestIdentity)).digest('hex');
+
+    return {
+        method,
+        endpoint,
+        requestIdentityHash,
+        requestIdentity
+    };
+}
+
+function sortEntries(entries: [string, unknown][]): [string, unknown][] {
+    return entries.sort((a, b) => (a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0));
+}
+
+function computeDataIdentity(config: AxiosRequestConfig): string | undefined {
+    const data = config.data;
+
+    if (!data) {
+        return undefined;
+    }
+
+    let dataString = '';
+    if (typeof data === 'string') {
+        dataString = data;
+    } else if (Buffer.isBuffer(data)) {
+        dataString = data.toString('base64');
+    } else {
+        try {
+            dataString = JSON.stringify(data);
+        } catch (e) {
+            if (e instanceof Error) {
+                throw new Error(`Unable to compute request identity: ${e.message}`);
+            } else {
+                throw new Error('Unable to compute request identity');
+            }
+        }
+    }
+
+    if (dataString.length > 1000) {
+        return 'sha1:' + crypto.createHash('sha1').update(dataString).digest('hex');
+    } else {
+        return dataString;
+    }
+}