Cache now works correctly