diff --git a/docker/pdo_ccf.dockerfile b/docker/pdo_ccf.dockerfile
index 6a1ee6b2..20edebbe 100644
--- a/docker/pdo_ccf.dockerfile
+++ b/docker/pdo_ccf.dockerfile
@@ -14,6 +14,8 @@
 # limitations under the License.
 # ------------------------------------------------------------------------------
 
+# syntax = docker/dockerfile:experimental
+
 ARG PDO_VERSION
 FROM pdo_ccf_base:${PDO_VERSION}
 
@@ -44,7 +46,9 @@ WORKDIR /project/pdo/tools
 COPY --chown=${UNAME}:${UNAME} tools/*.sh ./
 
 # build it!!!
-RUN /project/pdo/tools/build_ccf.sh
+ARG UID=1000
+ARG GID=${UID}
+RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip /project/pdo/tools/build_ccf.sh
 
 # Network ports for running services
 EXPOSE 6600
diff --git a/docker/pdo_client.dockerfile b/docker/pdo_client.dockerfile
index c8bb7f17..7e024521 100644
--- a/docker/pdo_client.dockerfile
+++ b/docker/pdo_client.dockerfile
@@ -14,6 +14,8 @@
 # limitations under the License.
 # ------------------------------------------------------------------------------
 
+# syntax = docker/dockerfile:experimental
+
 ARG PDO_VERSION
 FROM pdo_base:${PDO_VERSION}
 
@@ -63,7 +65,9 @@ WORKDIR /project/pdo/tools
 COPY --chown=${UNAME}:${UNAME} tools/*.sh ./
 
 # build it!!!
-RUN /project/pdo/tools/build_client.sh
+ARG UID=1000
+ARG GID=${UID}
+RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip /project/pdo/tools/build_client.sh
 
 ARG PDO_HOSTNAME
 ENV PDO_HOSTNAME=$PDO_HOSTNAME
diff --git a/docker/pdo_services.dockerfile b/docker/pdo_services.dockerfile
index 73710765..dc2a2868 100644
--- a/docker/pdo_services.dockerfile
+++ b/docker/pdo_services.dockerfile
@@ -14,6 +14,8 @@
 # limitations under the License.
 # ------------------------------------------------------------------------------
 
+# syntax = docker/dockerfile:experimental
+
 ARG PDO_VERSION
 FROM pdo_services_base:${PDO_VERSION}
 
@@ -48,7 +50,9 @@ WORKDIR /project/pdo/tools
 COPY --chown=${UNAME}:${UNAME} tools/*.sh ./
 
 # built it!
-RUN /project/pdo/tools/build_services.sh
+ARG UID=1000
+ARG GID=${UID}
+RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip /project/pdo/tools/build_services.sh
 
 # Network ports for running services
 EXPOSE 7001 7002 7003 7004 7005