Added support for caching of rows