ADR 2 introduced a second layer of caching for these two services, which isn't reflected in the code of these two classes. A lot of the comments and variable names still refer to the cache as a WAN cache/shared cache/network cache, when in reality it can be either that, or a server-local cache.