separate cache keys for each protocol
Merge branch 'master' into osx