Refactoring to handle different response from Sun

Fixing issue where stories were cached incorrectly, so loading a cached
story crashed the app.