Fixing a bug with new cache engine