Add check to cache before bundle and full path support.