Cleaner logging and more caching