Tidy up the basic references, injecting a modicum of caching to remote
references.