Cache class fixes