Fixed cache conflict. This could use some more thought.