Got rid of InstrumentingCache (needs rewriting anyway), commented out field instrumentation