Move caching logic out of central server include pathways.
Defining CACHE_NAME, even if caching is not turned on (as it's used in a function header)
Merge pull request #933 from bcipolli/CACHE_NAME_fix

CACHE_NAME fix