Bring back a better version of caching
Remove debug logging