Improve caching activation and Logger class