Moved to using pf::CHI for caching