Codebase Ticket #802 addendum, part 2
Bust that cache up.