Attempt optimizations using \Cache for #215