Fix dynamic scoping caching issue
Merge pull request #380 from kyriesent/patch-1

Fix for Issue 250: Dynamic scoping caching issue