Make cache static for #1187