updated for cache issues