diff --git a/xbps-src b/xbps-src
index 0c3d77cb969..21b3c586fa1 100755
--- a/xbps-src
+++ b/xbps-src
@@ -536,7 +536,10 @@ else
     export PATH="$MYPATH"
     if [ -n "$XBPS_CCACHE" ]; then
         CCACHEPATH="/usr/lib/ccache/bin"
-        export CCACHE_DIR="$XBPS_HOSTDIR/ccache-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
+        export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
+        # Avoid not using cached files just due to compiler mtime
+        # changes when e.g. bootstrapping
+        export CCACHE_COMPILERCHECK=content
         export PATH="$CCACHEPATH:$PATH"
         mkdir -p $CCACHE_DIR
     fi