Issue #2328777 by tim.plunkett: Refactor FAPI getCache()/setCache() into a standalone class.