fix method caching. Fixes #20265
bump versino
Updating version on trunk after tagging