diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ab8ef0b..b2c9359 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,37 +11,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.8']
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        exclude:
-          - os: windows-latest
-            python-version: '3.6'
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12-dev', 'pypy-3.8']
+        os: [ubuntu-20.04, macos-latest, windows-latest]
     timeout-minutes: 20
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
+          cache-dependency-path: |
+            setup.py
+            **/requirements.txt
 
       - name: Install pip
         run: python -m pip install --upgrade --disable-pip-version-check 'pip>=21.1'
 
-      - name: Get pip cache dir
-        id: pip-cache
-        run: echo "::set-output name=dir::$(pip cache dir)"
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ steps.pip-cache.outputs.dir }}
-            ./.tox
-          key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.py', '**/requirements.txt') }}
-          restore-keys: ${{ matrix.os }}-${{ matrix.python-version }}-pip-
-
       - name: Install dependencies
         run: python -m pip install --upgrade --disable-pip-version-check tox
 
diff --git a/pyproject.toml b/pyproject.toml
index ee31196..241a63a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ exclude = '''
 )/
 | docs/conf.py
 '''
-target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
+target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311']
 
 [tool.coverage.run]
 source = ['tabledata']
diff --git a/setup.py b/setup.py
index 5e72987..42de768 100644
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,7 @@ def get_release_command_class() -> Dict[str, setuptools.Command]:
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
diff --git a/tox.ini b/tox.ini
index b2362e7..ee1d893 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{36,37,38,39,310}
+    py{36,37,38,39,310,311,312}
     build
     clean
     cov