From 4c25b6cc555fd58d076ef685e9e66eef6e4c1ec0 Mon Sep 17 00:00:00 2001
From: Angel Caamal <acaamalcanul@google.com>
Date: Tue, 18 Aug 2026 15:58:22 +0000
Subject: [PATCH 1/2] fix(genai): ensure resource cleanup and fix async
 execution in content-cache tests

---
 ...ent-cache-create-use-update-delete.test.js | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/genai/content-cache/test/content-cache-create-use-update-delete.test.js b/genai/content-cache/test/content-cache-create-use-update-delete.test.js
index 94a1de6a38d..748020f6895 100644
--- a/genai/content-cache/test/content-cache-create-use-update-delete.test.js
+++ b/genai/content-cache/test/content-cache-create-use-update-delete.test.js
@@ -25,13 +25,32 @@ const updateSample = require('../content-cache-update.js');
 const deleteSample = require('../content-cache-delete.js');
 const {delay} = require('../../test/util');
 
-describe('content-cache-create-use-update-delete', async function () {
+describe('content-cache-create-use-update-delete', function () {
   this.timeout(600000);
   this.retries(5);
-  await delay(this.test);
-
   let contentCacheName;
 
+  before(async function () {
+    await delay(this.test);
+  });
+
+  after(async () => {
+    if (contentCacheName) {
+      try {
+        await deleteSample.deleteContentCache(
+          projectId,
+          undefined,
+          contentCacheName
+        );
+      } catch (err) {
+        console.error(
+          `Failed to delete content cache ${contentCacheName}:`,
+          err
+        );
+      }
+    }
+  });
+
   it('should create content cache', async () => {
     contentCacheName = await createSample.generateContentCache(projectId);
     assert.isString(contentCacheName);
@@ -61,5 +80,6 @@ describe('content-cache-create-use-update-delete', async function () {
       undefined,
       contentCacheName
     );
+    contentCacheName = undefined;
   });
 });

From 071ea43f54d92c798fd9a2d36e1c3699ce4b34a9 Mon Sep 17 00:00:00 2001
From: Angel Caamal <acaamalcanul@google.com>
Date: Tue, 18 Aug 2026 16:07:16 +0000
Subject: [PATCH 2/2] fix(genai): correct mocha retry delay and ensure content
 cache cleanup

---
 .../test/content-cache-create-use-update-delete.test.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/genai/content-cache/test/content-cache-create-use-update-delete.test.js b/genai/content-cache/test/content-cache-create-use-update-delete.test.js
index 748020f6895..537c7d5faeb 100644
--- a/genai/content-cache/test/content-cache-create-use-update-delete.test.js
+++ b/genai/content-cache/test/content-cache-create-use-update-delete.test.js
@@ -30,8 +30,8 @@ describe('content-cache-create-use-update-delete', function () {
   this.retries(5);
   let contentCacheName;
 
-  before(async function () {
-    await delay(this.test);
+  beforeEach(async function () {
+    await delay(this.currentTest);
   });
 
   after(async () => {