Making a better implementation on validity stuff. There are still some issues, though, with caching pipelines.