Updated the filter query caching to be persistent across different
views.