local cache and cleanup coming through
Merge remote-tracking branch 'origin/cassandra' into cassandra