Fix issue 1612, "Symbol('f')(x) != Function('f')(x)"

There is a problem with a test failure in simplify, which involves
caching.  See the issue page.

Conflicts:
	sympy/core/basic.py
	sympy/core/tests/test_sympify.py