Swap out custom cache for that in lib-noir