re-enabled client ID caching because it makes a noticable speed difference