Lots of cleaning, enriched Connection objects
Moved caching behavior back to nodes