Clean up, use a cached instantiation.