Fix cache population problem
Merge pull request #3 from jonathangreen/1.x-fix-cache

Fix cache population problem