Implementing Josh's cache schema fix on Master instead of just in the Mu...

...lti Part form post branch.