Merge "objectcache: remove dangling WAN cache EventRelayer references"