distro: fix configure_keepcache().
Merge branch 'fix-configure-keepcache'