[Reviewer: Rob] Co-req changes for the cassandra store work.