Fix CacheMultiStoreWithVersion (inter-block cache)

[alexanderbez]

• Targeted PR against correct branch (see CONTRIBUTING.md)

• Linked to github-issue with discussion and accepted design OR link to spec that describes this work.

• Wrote tests

• Updated relevant documentation (docs/)

• Added a relevant changelog entry to the Unreleased section in CHANGELOG.md

• Re-reviewed Files changed in the github PR explorer

---

For Admin Use:

• Added appropriate labels to PR (ex. wip, ready-for-review, docs)
• Reviewers Assigned
• Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

[codecov]

Codecov Report

Merging #4997 into master will increase coverage by <.01%.
The diff coverage is 57.14%.

@@            Coverage Diff             @@
##           master    #4997      +/-   ##
==========================================
+ Coverage   55.56%   55.56%   +<.01%     
==========================================
  Files         287      287              
  Lines       17514    17521       +7     
==========================================
+ Hits         9731     9735       +4     
- Misses       7083     7085       +2     
- Partials      700      701       +1

[fedekunze]

utACK