Replaced some order with reorder within cache key generation.
Merge branch 'reorder' into develop