add better verification for caller_sites to ensure calls, fixes #3722