Cache update
This commit contains cache update related changes - 5daa6130. Feel free to merge it to master after testing. No other fixes (if any are needed) are part of this with respect to #523 (closed).
This commit contains cache update related changes - 5daa6130. Feel free to merge it to master after testing. No other fixes (if any are needed) are part of this with respect to #523 (closed).