Added cache data check