Improve cache packaging