refactoring: do not keep the cacheid around