Issue #2686765 by sidharthap, thhafner: cacheUntilEntityChanges() is deprecated and should be replaced with addCacheableDependency()