More bundle cache fixes.