#20 Should be the only necessary commit to make this work.
Merge pull request #23 from campadrenalin/bug20-cache-filter

Cache Filter