Cache refactoring for #113 and #116