Fix findInstance and _reuseFrom