BACKLOG-855 made cache key more in line with others