Updates to correct cache issues with List Manager