revert my cruft regarding incremental message cache building, it targetted wrong...