PROBCORE-585 Use correct cache? Need to test it out more.