Improved message store cache reconciliation

Now that we have appropriate indexes, we can reconcile the message store cache without reading individual messages from Riak.
my OCD wants `from foo import bar` lines grouped separately from `import foo`