Remove static caching in deprecated function that seems to break tests