[CHANGE] Use another location definition for caching block

As discussed in #516 here a proposed PR to fix the issue.