Cache key generator tweaks
Merge pull request #9 from chuckdumont/master

Cache key generator tweaks