Rather large commit for interface cache checking

once again