This should hopefully make the client not corrupt it's cache randomly, and prevents the config sets from racing shutdown
e83d1e6b72