removed row caching for now