Ensure the same cached instance is returned for each call, MPS-19283