cache is split in two classes
Merge branch 'master' of git@github.com:quiqueman/calypso-utils.git