Minor refactoring, setting up cache item dependencies