big error. Removed caching.
Merge pull request #273 from modilabs/design_improvements

big error. Removed caching.