cache wrapper methods
(cherry picked from commit 38cae13d692bd57c23ff31604c433124f8125af9)