Fix block caching issue.