Revert "Fix ClientCacheFilter"

This reverts commit a23f6782c4bbd58f99d7ee346c846797800f6f91.