Simplify updating of cache because we're using primary keys now