Fixing call-cache issue

After multiples test, we found that the glob was causing an issue with call caching. Avoiding using glob seems to solve the issue based on the tests so far.