Added BlockFactories, changed cache policy