Fixing concurrency issues
Fixing spacing bug for T_CALLABLE
Fix several caching issues