Fix for non existing cache data