Cache now works correctly with tags