more caching including cache invalidation and refactoring #142

Closed marco-svitol closed 2 months ago