Strange bug in object caching, it was not taking care of variable scoping
Merge branch 'version-1.3'