Fixes following _premium caching introduced in 092da060bb