[NUCCACHE-38] Support NUCCORE-1112 refactoring