Somehow overwrote the real caching mechanism
Merge pull request #25 from dotcloud/fix-cache

Somehow overwrote the real caching mechanism