Move all cache-related packages to single parent package