diff --git a/.circleci/config.yml b/.circleci/config.yml
index 85ba247..57d009f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ commands:
         type: string
     steps:
       - restore_cache:
-          key: deps-v1-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
+          key: deps-v2-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
       - run:
           name: Install python deps in venv
           command: |
@@ -30,7 +30,7 @@ commands:
             # '-e .' installation.
             pip install --progress-bar=off -e .
       - save_cache:
-          key: deps-v1-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
+          key: deps-v2-<<parameters.python_version>>-{{ .Branch }}-{{ checksum "requirements.txt" }}-{{ checksum "setup.py" }}
           paths:
             - "venv"
 
@@ -48,7 +48,7 @@ jobs:
         default: false
         description: "Enforce coverage not slipping"
     docker:
-      - image: circleci/python:<<parameters.python_version>>
+      - image: cimg/python:<<parameters.python_version>>
     steps:
       - checkout
       - installvenv:
@@ -78,9 +78,9 @@ jobs:
       python_version:
         type: string
         description: "Version of python to test against"
-        default: '3.6'
+        default: '3.8'
     docker:
-      - image: circleci/python:<<parameters.python_version>>
+      - image: cimg/python:<<parameters.python_version>>
     steps:
       - checkout
       - installvenv:
@@ -125,30 +125,6 @@ workflows:
       # We try to test against all non-end-of-life Python versions:
       #
       # https://devguide.python.org/devcycle/#end-of-life-branches
-      - test:
-          name: test-3.5
-          python_version: "3.5"
-          requires:
-            - test-3.8
-          filters:
-            tags:
-              only: /v\d+\.\d+\.\d+(-[\w]+)?/
-      - test:
-          name: test-3.6
-          python_version: "3.6"
-          requires:
-            - test-3.8
-          filters:
-            tags:
-              only: /v\d+\.\d+\.\d+(-[\w]+)?/
-      - test:
-          name: test-3.7
-          python_version: "3.7"
-          requires:
-            - test-3.8
-          filters:
-            tags:
-              only: /v\d+\.\d+\.\d+(-[\w]+)?/
       - test:
           name: test-3.8
           python_version: "3.8"
@@ -159,9 +135,6 @@ workflows:
       - deploy:
           context: PyPI
           requires:
-            - test-3.5
-            - test-3.6
-            - test-3.7
             - test-3.8
           filters:
             tags:
diff --git a/.python-version b/.python-version
index df8eb25..eee6392 100644
--- a/.python-version
+++ b/.python-version
@@ -1 +1 @@
-sqlalchemy-vertica-python-3.8.5
+3.8.16
diff --git a/metrics/bigfiles_high_water_mark b/metrics/bigfiles_high_water_mark
index dd35c6b..55a318f 100644
--- a/metrics/bigfiles_high_water_mark
+++ b/metrics/bigfiles_high_water_mark
@@ -1 +1 @@
-548
\ No newline at end of file
+551
\ No newline at end of file
diff --git a/metrics/coverage_high_water_mark b/metrics/coverage_high_water_mark
index 525c46d..c634cd6 100644
--- a/metrics/coverage_high_water_mark
+++ b/metrics/coverage_high_water_mark
@@ -1 +1 @@
-29.2700
+30.1200
diff --git a/metrics/flake8_high_water_mark b/metrics/flake8_high_water_mark
index f5c8955..bb95160 100644
--- a/metrics/flake8_high_water_mark
+++ b/metrics/flake8_high_water_mark
@@ -1 +1 @@
-32
+33