Packaging and cache control fixes.