diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 483d670..06e3db7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -71,8 +71,8 @@ jobs:
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: dockette/coder:${{ matrix.image }}
           platforms: linux/amd64
-          cache-from: type=gha
-          cache-to: type=gha
+          cache-from: type=gha,scope=${{ matrix.image }}
+          cache-to: type=gha,scope=${{ matrix.image }},mode=max
 
   docs:
     name: "Docs"
diff --git a/fx/Dockerfile b/fx/Dockerfile
index ebff358..e45489b 100644
--- a/fx/Dockerfile
+++ b/fx/Dockerfile
@@ -47,7 +47,7 @@ RUN \
         php8.5-zip php8.5-bcmath php8.5-apcu php8.5-imagick \
         php8.5-xdebug php8.5-pcov \
         php8.5-igbinary php8.5-gmp php8.5-ldap \
-        php8.5-amqp php8.5-memcached php8.5-xsl php8.5-yaml \
+        php8.5-amqp php8.5-memcache php8.5-memcached php8.5-xsl php8.5-yaml \
         # Python
         python3 python3-pip python3-venv \
         # Rootless Docker (docker-ce is already in the base image)
diff --git a/php/Dockerfile b/php/Dockerfile
index 894dfe3..4d9799b 100644
--- a/php/Dockerfile
+++ b/php/Dockerfile
@@ -31,7 +31,7 @@ RUN \
         php8.5-zip php8.5-bcmath php8.5-apcu php8.5-imagick \
         php8.5-xdebug php8.5-pcov \
         php8.5-igbinary php8.5-gmp php8.5-ldap \
-        php8.5-amqp php8.5-memcached php8.5-xsl php8.5-yaml \
+        php8.5-amqp php8.5-memcache php8.5-memcached php8.5-xsl php8.5-yaml \
         # GitHub CLI
         gh \
         # Chrome libs (agent-browser)