Support Cassandra String based partition keys

Fix for #1518 and #1591
This can go outside of the switch since the switch always returns.