Adding no-recursion and cache
Updates for using script