Added lock to cassandra key cache, changed test port to 9001
Merge branch 'develop' into brian-scratch