Fixing node property caching behaviour