SimpleCassandraRepository refactoring