Added support for caching results across the board.