Server cache fix