Fixed issue where requesting a factory caused it to be executed anyhow.