Further client cache optimization