Code cleanup - cache package.