Merge "recovery: Remove obsolete code that supports "CACHE:foo" format."