- include criteria in the cache key - implement equals for criteria - add basic automated tests SVN: 34502