Fix caching extended properties