Changed _cache structure