Make sure we check that both parts of the standard are cached

Previously we would cache on first time through and so vocabulary was left
empty