final cache fixes