 
         private var feedCellLayoutHash = [String: FeedCellLayout]()
 
-        private func feedCellLayoutOfFeed(feed: DiscoveredFeed) -> FeedCellLayout? {
+        private mutating func feedCellLayoutOfFeed(feed: DiscoveredFeed) -> FeedCellLayout {
             let key = feed.id
 
-            return feedCellLayoutHash[key]
+            if let layout = feedCellLayoutHash[key] {
+                return layout
+
+            } else {
+                let layout = FeedCellLayout(feed: feed)
+
+                updateFeedCellLayout(layout, forFeed: feed)
+
+                return layout
+            }
         }
 
         private mutating func updateFeedCellLayout(layout: FeedCellLayout, forFeed feed: DiscoveredFeed) {

                    break
                }

                cell.configureWithFeed(feed, layoutCache: layoutCache, needShowSkill: needShowSkill)

                /*
                cell.playOrPauseAudioAction = { [weak self] cell in

                    break
                }

                cell.configureWithFeed(feed, layout: layout, needShowSkill: needShowSkill)

                cell.tapURLInfoAction = { [weak self] URL in
                    println("tapURLInfoAction URL: \(URL)")
