Fix and Utilize GetCommitKVStore

[alexanderbez]

Keeping the code DRY by utilizing GetCommitKVStore which now does the inter-block cache check/unwrapping. This should guarantee that whenever we get a store in the mapping, it's not wrapped.

---

• 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 #5024 into master will increase coverage by 0.02%.
The diff coverage is 40%.

@@            Coverage Diff             @@
##           master    #5024      +/-   ##
==========================================
+ Coverage    55.5%   55.52%   +0.02%     
==========================================
  Files         287      287              
  Lines       17538    17539       +1     
==========================================
+ Hits         9734     9739       +5     
+ Misses       7104     7100       -4     
  Partials      700      700

[fedekunze]

utACK

[AdityaSripal]

utACK