Added fix for uneccessary update_cache calls