Breakup dep cache helpers
Move logical paths to legacy