Simplify decrement
Merge pull request #5764 from lucasmichot/4.2-cache-arraystore-decrement

[4.2] Normalize ArrayStore And FileStore Decrement
Merge branch '4.2'