diff -Nru old/pbuilder-adv new/pbuilder-adv
--- old/pbuilder-adv	2019-04-30 23:19:28.799443070 +0200
+++ new/pbuilder-adv	2019-04-30 23:31:09.982326267 +0200
@@ -13,13 +13,18 @@
 BINDMOUNTS=/var/cache/pbuilder/result
 HOOKDIR=/etc/pbuilder/hook.d
 
-if [ "$1" = build ]; then
+APTCACHE=/var/cache/pbuilder/aptcache
+
+if [ "$1" = "build" -o "$1" = "--build" ]; then
  shift
  pbuilder build --allow-untrusted --distribution "$DISTRIBUTION" --mirror "$MIRRORSITE" --bindmounts "$BINDMOUNTS" --hookdir "$HOOKDIR" "$@"
  exit
 fi
 
-[ "$1" = "clean" ] && rm -rf /var/cache/pbuilder/*
+if [ "$1" = "clean" -o "$1" = "--clean" ]; then
+ rm -rf /var/cache/pbuilder/*
+ mkdir -p $APTCACHE
+fi
 
 # http://edseek.com/~jasonb/articles/pbuilder_backports/pbuilderbuild.html
 
diff -Nru old/pbuilder-adv386 new/pbuilder-adv386
--- old/pbuilder-adv386	2019-04-30 23:19:31.399417972 +0200
+++ new/pbuilder-adv386	2019-04-30 23:30:07.688366378 +0200
@@ -13,13 +13,18 @@
 BINDMOUNTS=/var/cache/pbuilder_i386/result
 HOOKDIR=/etc/pbuilder/hook386.d
 
-if [ "$1" = build ]; then
+APTCACHE=/var/cache/pbuilder_i386/aptcache
+
+if [ "$1" = "build" -o "$1" = "--build" ]; then
  shift
  pbuilder build --aptcache /var/cache/pbuilder_i386/aptcache --basetgz /var/cache/pbuilder_i386/base.tgz --buildplace /var/cache/pbuilder_i386/build/ --buildresult /var/cache/pbuilder_i386/result/ --allow-untrusted --distribution "$DISTRIBUTION" --mirror "$MIRRORSITE" --bindmounts "$BINDMOUNTS" --hookdir "$HOOKDIR" "$@"
  exit
 fi
 
-[ "$1" = "clean" ] && rm -rf /var/cache/pbuilder_i386/*
+if [ "$1" = "clean" -o "$1" = "--clean" ]; then
+ rm -rf /var/cache/pbuilder_i386/*
+ mkdir -p $APTCACHE
+fi
 
 # http://edseek.com/~jasonb/articles/pbuilder_backports/pbuilderbuild.html