Issue #3368537 by catch, TwoD, alexpott, cmlara, sboden: Ensure trailing...

Issue #3368537 by catch, TwoD, alexpott, cmlara, sboden: Ensure trailing whitespace at the end of a cache ID results in a unique cache item

(cherry picked from commit fb2469d3)