Revert "1310 from remove-cache"
Merge pull request #1490 from affektive/revert-1489-1310

Revert "1310 from remove-cache"