More fixing of my breaking changes to checking the cachecallback