static Cache... I thought this was committed ages ago