Adding doc blocks, and reformatting for PSR-2
Fixing scruitinizer issues
Cleaning up code
Fixing createCacheInstance
Updating conflict