Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken * commit '3e360000fcb1cc60d8786d1340f9a468014c6435': Fix (again) for bug 2558156, update cache encoding correctly
Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken * commit '3e360000fcb1cc60d8786d1340f9a468014c6435': Fix (again) for bug 2558156, update cache encoding correctly