Remove caches from factory, and fix scrutinizer