It seems like a generic feature to me (not specific to the proxy), so logically it should live in the base class. Fixes gh-844
