diff --git a/bin/crew b/bin/crew
index a669bb2d5..5d265f0af 100755
--- a/bin/crew
+++ b/bin/crew
@@ -518,6 +518,7 @@ def cache_build
       # because some builds will use that information.
       # Backup build cachefile it if exists.
       FileUtils.mv @build_cachefile, "#{@build_cachefile}.bak", force: true if File.file?(@build_cachefile)
+      FileUtils.mv "#{@build_cachefile}.sha256", "#{@build_cachefile}.sha256.bak", force: true if File.file?("#{@build_cachefile}.sha256")
       Dir.chdir(CREW_BREW_DIR) do
         system "tar c#{@verbose} #{@pkg_build_dirname} \
         | nice -n 20 #{CREW_PREFIX}/bin/zstd -c  --ultra --fast -f -o #{@build_cachefile} -"
@@ -886,7 +887,7 @@ def unpack(meta)
       system "tar -Izstd -x#{@verbose}f #{@build_cachefile} -C #{CREW_BREW_DIR}", exception: true
       # Need to reset @extract_dir to the extracted cached build
       # directory.
-      @extract_dir = `tar --exclude='./*/*' -tf #{@build_cachefile} | cut -d '/' -f 1 | sort -u`.chomp
+      @extract_dir = `tar -Izstd --exclude='./*/*' -tf #{@build_cachefile} | cut -d '/' -f 1 | sort -u`.chomp
     else
       @pkg.cached_build = false
       case File.basename meta[:filename]
diff --git a/lib/const.rb b/lib/const.rb
index ffd3e125a..c412bb76c 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -1,6 +1,6 @@
 # Defines common constants used in different parts of crew
 
-CREW_VERSION = '1.31.4'
+CREW_VERSION = '1.31.5'
 
 # kernel architecture
 KERN_ARCH = `uname -m`.chomp