Testing cache, bugfixes
Testing
Logging, Refactoring