Cache Factory fixes