Reworked index() slightly to make caching simpler and only use one key.
Merge pull request #97 from Macil/indexstuff

index() rework to use only one cache key