Better dry run checking for caching