Changed portfolio json handling - for better caching