Add support for using cached data