Speed up ClientForm for individual clients.
Clean up after client form speed-up.
Merge branch 'cache'