[CHANGE] Use another location definition for caching block
[FIX] Ensure tests are passing
Merge pull request #521 from TheSerapher/issue-516

[CHANGE] Use another location definition for caching block