The pieces of logging changes that I split out manually
Actual caching stuff that is split out