Added prefix to APC cache store. Cleaned up methods. Fixes #1573.
Merge branch '4.0'