Clean fix for #6059 without tests.
Fix the cache - ID
Fix the cache id, second instance
Merge pull request #6139 from openscholar/6138

Fix the caching of the facet filter widget