Add some logging, properly get from cache