Fix for force revalidation on maps, arrays and objects