This brings us down from 2.2 seconds to 0.2 seconds reload time
*without* the obscure caching in place.  This will likely solve
the filter reload issues that some people had.  :)

(cherry picked from commit 2c5d626c)