Issue #27 Lifecycle stuff, ready for final review pass

Before I start implementing this all over the place!
should this be a caches.remove() ?