Cache filter options

https://www.pivotaltracker.com/story/show/55555566