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 them alphabetical, but I can manage alphabetical within the two groups. :-)