[FIX] Storing/showing wrong data from cache

Fixes #1517