Merge "Prevent key removal on cache update" into qt-r1-dev