element.py, source.py: Cleanup how Source cache keys are calculated.

Recently after a refactor we kept the Source adding workspace keys
to the source keys because, now clean this up to have the workspace
key added directly in the Element cache key calculation.

This breaks cache keys.