streamlining code
switched caching back on