Modifications and additional checks for the configuration handler cache.