Remove a few checks for context cache attributes where they're not necessary anymore