Removed strange assignment of story
Added caching