Fixes fooled by the cache behaviour errors