Config cache, bugfixing