- cleaned up
- implemented CacheHooks
- improved control over logging