Merge pull request #817 from rustyswayne/1.4.0-lists

#M-364 Fixed
Introduced CachedProductQuery