Fix existing cxx cache benchmarks.
Merge branch 'dev' of github.com:mapbox/carmen into dev