[arch-dev-public] [PATCH] Further fixes to cache_dir handling