Fixed bug: stale cache