cache must be set only on non empty results
Merge branch 'hotfix/noresults-cache'