Extract method lookup to private method

Test also attached.