Uses new cache infrastructure
Merge pull request #48 from nsendetzky/master

Uses new cache infrastructure