index() rework to use only one cache key

Reworked index() slightly to make caching simpler and only use one key.

(One note, remember to clear the cache after applying or else there are a ton of errors.)