Added caching to console