Conform to latest polyglot cache expectations