Codebase Ticket #802 addendum, part 3
Cache cache for the fun of it.
Temporarily turn off catalog, merge what we have back to master.