Second option for improving the cached client.