Merge "Search both CE/DE storage when clearing caches." into nyc-dev