Fix cache generator tests