diff --git a/pyopencl/__init__.py b/pyopencl/__init__.py
index 45af488134e4e2dc2b0d81864a1cb7de0bb84fe5..2cd5be9bde922b62f92a0bf88180a1b138467013 100644
--- a/pyopencl/__init__.py
+++ b/pyopencl/__init__.py
@@ -461,6 +461,8 @@ def _add_functionality():
     CommandQueue.__enter__ = command_queue_enter
     CommandQueue.__exit__ = command_queue_exit
 
+    # }}}
+
     # {{{ _Program (the internal, non-caching version)
 
     def program_get_build_logs(self):
diff --git a/pyopencl/cache.py b/pyopencl/cache.py
index c5672306a59155f4db9489b70a48ff9272517e4e..979a52583f71f8a0eca24086aebed30823853221 100644
--- a/pyopencl/cache.py
+++ b/pyopencl/cache.py
@@ -318,7 +318,7 @@ class _SourceInfo(Record):
 
 
 def _create_built_program_from_source_cached(ctx, src, options, devices, cache_dir):
-    from os.path import join  # required in multiple places below
+    from os.path import join
 
     include_path = ["."]