Mitigate dependency upon ConfigCache