Remove logger support. Not working with caching