Since the equiv. cache lock no longer needs to be held across multiple
method calls, move the locking inside and don't expose it to users.