#61 Further reductions of redundant caching/networking code