Update cpp-common
Fix up mock cache