Added changes from Dmitri and updated config.cache_classes
merge conflict