- Silly bug in caching configuration
- Few cleanup tasks
- Added some tests around caching