General fixes and improvements for the cache. Previous commits on fluids broke the 'Replay' cache a bit.