Added buffering to ensure we have less chatter with cassandra
Refactored to avoid the need to copy for mark check