Merge pull request #382 from subvertallchris/master

cache_key method and specs