added test for cache with max entries ON-heap set
Merge remote-tracking branch 'origin/master'