BUGFIX: Saving data to cache can cause problems