Logging and caching made to more obvious places

This reverts commit e5416f513df45439d3b96e888e116a21381efd41.