Using WAD instead of bundle_cache