added cached checks
added cached checks