Bug fixes Require, cache overriding