diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efe73c6..33b3a8f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,35 +9,22 @@ jobs:
 
   upload:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Install libmemcached-dev
-      run: |
-        sudo apt-get update
-        sudo apt-get install libmemcached-dev
-
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
         python-version: '3.11'
 
-    - name: Install dependencies
-      run: |
-        pip install --upgrade pip
-        pip install -r requirements-dev.txt
-
-    - name: Create source dist
-      run: python setup.py sdist
+    - name: Install build
+      run: pip install build
 
-    - name: Create wheel dist
-      run: python setup.py bdist_wheel
+    - name: Create build
+      run: python -m build
 
-    - name: Upload with twine
-      env:
-        TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-      run: |
-        ls -l dist/*
-        twine upload dist/*
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/diskcache/__init__.py b/diskcache/__init__.py
index 1931a0d..7757d66 100644
--- a/diskcache/__init__.py
+++ b/diskcache/__init__.py
@@ -61,8 +61,8 @@
     pass
 
 __title__ = 'diskcache'
-__version__ = '5.6.1'
-__build__ = 0x050601
+__version__ = '5.6.3'
+__build__ = 0x050603
 __author__ = 'Grant Jenks'
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2016-2023 Grant Jenks'
diff --git a/diskcache/core.py b/diskcache/core.py
index af65454..7a3d23b 100644
--- a/diskcache/core.py
+++ b/diskcache/core.py
@@ -531,7 +531,7 @@ def __init__(self, directory=None, timeout=60, disk=Disk, **settings):
 
         sql(
             'CREATE INDEX IF NOT EXISTS Cache_expire_time ON'
-            ' Cache (expire_time)'
+            ' Cache (expire_time) WHERE expire_time IS NOT NULL'
         )
 
         query = EVICTION_POLICY[self.eviction_policy]['init']
@@ -1703,9 +1703,6 @@ def peek(
             except IOError:
                 # Key was deleted before we could retrieve result.
                 continue
-            finally:
-                if name is not None:
-                    self._disk.remove(name)
             break
 
         if expire_time and tag:
@@ -2031,7 +2028,10 @@ def create_tag_index(self):
 
         """
         sql = self._sql
-        sql('CREATE INDEX IF NOT EXISTS Cache_tag_rowid ON Cache(tag, rowid)')
+        sql(
+            'CREATE INDEX IF NOT EXISTS Cache_tag_rowid ON Cache(tag, rowid) '
+            'WHERE tag IS NOT NULL'
+        )
         self.reset('tag_index', 1)
 
     def drop_tag_index(self):
diff --git a/tests/test_deque.py b/tests/test_deque.py
index 71c69e2..f997a86 100644
--- a/tests/test_deque.py
+++ b/tests/test_deque.py
@@ -302,3 +302,13 @@ def test_rotate_indexerror_negative(deque):
 
     with mock.patch.object(deque, '_cache', cache):
         deque.rotate(-1)
+
+
+def test_peek(deque):
+    value = b'x' * 100_000
+    deque.append(value)
+    assert len(deque) == 1
+    assert deque.peek() == value
+    assert len(deque) == 1
+    assert deque.peek() == value
+    assert len(deque) == 1