cache_expiration not set for contextid 16 - possible fix?

[DevDuck]

Hi!

Right now, the contextid is coming as `16` instead of `2`, as it used to be before. Because of this, the `cache_expiration` field is not being set.

Looking at the code here, can we just add a similar check for `contextid == 16` to set the cache_expiration as well?
Or is there a better way to handle this with the new contextid?

Thanks!