Resolve a conflict with the merge for net_cache