Issue #45:
 - Clean ups, leaving HeapCache et al for now, for illustration purposes