Fixed a bug where the wrong data was cached.