Renamed NullCache to Noop in tests