CacheFavtory bugfix, Factory optimizations,...