Fixes, validate & cache