Clean up finder implementation to make sure a new instance is returned each time