Implement #2, Query Result Cache.  Currently done at a segment level.  Need to make size configurable and test