diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8815bb848248cff4a625694302d236d945afa0e2..55cf8463bcdbb98cb4cd106ce4c95ad273c63874 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -17,16 +17,17 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.uv
-        key: ${{ runner.os }}-uv-${{ hashFiles('**/uv.lock') }}
+        key: ${{ runner.os }}-uv-${{ hashFiles('**/uv.lock') }}-${{ matrix.python-version }}
         restore-keys: |
-          ${{ runner.os }}-uv-
+          ${{ runner.os }}-uv-${{ matrix.python-version }}
     - name: Install uv
       run: |
         curl -LsSf https://astral.sh/uv/install.sh | sh
-    - name: Set up Python ${{ matrix.python-version }}
-      run: uv venv --python 3.13
-    - name: Install dependencies
-      run: uv pip install .[dev]
+        uv venv --python 3.13
+        uv pip install .[dev]
+      with:
+        cache-key: ${{ runner.os }}-uv-${{ hashFiles('**/uv.lock') }}-${{ matrix.python-version }}
+        cache-name: uv
     - name: Analyzing the code with our lint
       run: |
         make lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 11fd54361cb395a3eb72af05bef68f53ab9a9f5f..b9e8ef189c23ce4f5ffa3f60fdf21cdb4d8a03eb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -29,9 +29,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.uv
-        key: ${{ runner.os }}-uv-${{ hashFiles('**/uv.lock') }}
+        key: ${{ runner.os }}-uv-${{ hashFiles('**/uv.lock') }}-${{ matrix.python-version }}
         restore-keys: |
-          ${{ runner.os }}-uv-
+          ${{ runner.os }}-uv-${{ matrix.python-version }}
 
     - name: Wait for Pinecone service to start
       run: |
@@ -42,7 +42,7 @@ jobs:
       run: |
         curl -LsSf https://astral.sh/uv/install.sh | sh
     - name: Set up Python ${{ matrix.python-version }}
-      run: uv venv --python 3.13
+      run: uv venv --python ${{ matrix.python-version }}
 
     # only needed for local testing
     # - name: Add Poetry to PATH