Merge "remove filter_cache" into nextgenv2