Fix to work with latest eea.cache changes