FIXED: Normalised whitespaces
ADDED: @todo to test cases
REMOVED: Commented out garbage code from cache-main.php