Making cache less processor intensive.
Merge remote-tracking branch 'origin/dev'