The Great JCache Pull request :)

Please remove commented out code.