Separated the 1.3 compatible cache class from the rest of the code and reverted a few unneeded changes.

This also handles the key better internally to prevent multiple "making" of the key.