fixing #5341 and colouring for cache relevant fields #4915 and #4944