diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..723ef36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
\ No newline at end of file
diff --git a/README.txt b/README.txt
index f6f92c4..6d02649 100644
--- a/README.txt
+++ b/README.txt
@@ -107,6 +107,14 @@ OR
 require_once "DbSimple/Connect.php";
 $DB = new DbSimple_Connect("pgsql://login:password@host/database");
 
+OR
+
+You can use PDO DSN syntax (socket connections currently supported only with MySQL providers):
+
+require_once "DbSimple/Connect.php";
+$DB = new DbSimple_Connect("mysqli:unix_socket=/cloudsql/app:instance;user=root;pass=;dbname=testdb");
+
+
 Listing 2: Fetch all resulting rows
 
 $rows = $DB->select('SELECT * FROM ?_user LIMIT 10');
diff --git a/lib/DbSimple/CacherImpl.php b/lib/DbSimple/CacherImpl.php
new file mode 100644
index 0000000..986cb13
--- /dev/null
+++ b/lib/DbSimple/CacherImpl.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Created by JetBrains PhpStorm.
+ * User: sib
+ * Date: 14.10.13
+ * Time: 17:40
+ * To change this template use File | Settings | File Templates.
+ */
+
+class CacherImpl implements Zend_Cache_Backend_Interface {
+
+    protected $callback;
+
+    public function __construct($callback) {
+        if ( is_callable($callback) ) {
+            $this->callback = $callback;
+        } else {
+            $this->callback = $this->callbackDummy;
+        }
+    }
+
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array()) {}
+
+    public function remove($id) {}
+
+    public function test($id) {}
+
+    public function save($data, $id, $tags = array(), $specificLifetime = false)
+    {
+        return call_user_func($this->callback, $id, $data);
+    }
+
+    public function load($id, $doNotTestCacheValidity = false)
+    {
+        return call_user_func($this->callback, $id);
+    }
+
+    public function setDirectives($directives) {}
+
+    protected function callbackDummy($k, $v)
+    {
+        return null;
+    }
+
+} // CacherImpl class
\ No newline at end of file
diff --git a/lib/DbSimple/Connect.php b/lib/DbSimple/Connect.php
index 4706069..6489c89 100644
--- a/lib/DbSimple/Connect.php
+++ b/lib/DbSimple/Connect.php
@@ -118,7 +118,7 @@ protected function connect($dsn)
 		if (!isset($parsed['scheme']))
 			$this->errorHandler('Невозможно загрузить драйвер базы данных', $parsed);
 		$this->shema = ucfirst($parsed['scheme']);
-		require_once dirname(__FILE__).'/'.$this->shema.'.php';
+		require_once __DIR__.'/'.$this->shema.'.php';
 		$class = 'DbSimple_'.$this->shema;
 		$this->DbSimple = new $class($parsed);
 		$this->errmsg = &$this->DbSimple->errmsg;
@@ -256,18 +256,7 @@ public function setCachePrefix($prx)
 	 */
 	protected function parseDSN($dsn)
 	{
-		$parsed = parse_url($dsn);
-		if (!$parsed)
-			return null;
-		$params = null;
-		if (!empty($parsed['query']))
-		{
-			parse_str($parsed['query'], $params);
-			$parsed += $params;
-		}
-		$parsed['dsn'] = $dsn;
-		return $parsed;
+        return DbSimple_Generic::parseDSN($dsn);
 	}
-}
 
-?>
+}
diff --git a/lib/DbSimple/Database.php b/lib/DbSimple/Database.php
old mode 100644
new mode 100755
index 1a3a6ad..86719ae
--- a/lib/DbSimple/Database.php
+++ b/lib/DbSimple/Database.php
@@ -74,6 +74,15 @@
 if (!defined('DBSIMPLE_PARENT_KEY'))
     define('DBSIMPLE_PARENT_KEY', 'PARENT_KEY'); // forrest-based resultset support
 
+
+if ( !interface_exists('Zend_Cache_Backend_Interface', false) ) {
+    require_once __DIR__ . '/Zend/Cache.php';
+    require_once __DIR__ . '/Zend/Cache/Backend/Interface.php';
+}
+
+require_once __DIR__ . '/CacherImpl.php';
+
+
 /**
  *
  * Base class for all databases.
@@ -262,10 +271,24 @@ public function setLogger($logger)
      * Set cache mechanism called during each query if specified.
      * Returns previous handler.
      */
-    public function setCacher(Zend_Cache_Backend_Interface $cacher=null)
+    public function setCacher($cacher=null)
     {
         $prev = $this->_cacher;
-        $this->_cacher = $cacher;
+
+        if ( is_null($cacher) ) {
+            return $prev;
+        }
+
+        if ($cacher instanceof Zend_Cache_Backend_Interface) {
+            $this->_cacher = $cacher;
+            return $prev;
+        }
+
+        if ( is_callable($cacher) ) {
+            $this->_cacher = new CacherImpl($cacher);
+            return $prev;
+        }
+
         return $prev;
     }
 
@@ -444,7 +467,7 @@ private function _query($query, &$total)
         $rows = false;
         $cache_it = false;
         // Кешер у нас либо null либо соответствует Zend интерфейсу
-        if (!empty($this->attributes['CACHE']) && $this->_cacher)
+        if ( !empty($this->attributes['CACHE']) && ($this->_cacher instanceof Zend_Cache_Backend_Interface) )
         {
 
             $hash = $this->_cachePrefix . md5(serialize($query));
@@ -1323,7 +1346,7 @@ public function addIgnoreInTrace($name)
      * Return part of stacktrace before calling first library method.
      * Used in debug purposes (query logging etc.).
      */
-    protected function findLibraryCaller()
+    public function findLibraryCaller()
     {
         $caller = call_user_func(
             array(&$this, 'debug_backtrace_smart'),
@@ -1387,4 +1410,3 @@ private function debug_backtrace_smart($ignoresRe=null, $returnCaller=false)
     }
 
 }
-?>
diff --git a/lib/DbSimple/Generic.php b/lib/DbSimple/Generic.php
old mode 100644
new mode 100755
index 919cd63..5dc2f14
--- a/lib/DbSimple/Generic.php
+++ b/lib/DbSimple/Generic.php
@@ -85,8 +85,17 @@ class DbSimple_Generic
      * Universal static function to connect ANY database using DSN syntax.
      * Choose database driver according to DSN. Return new instance
      * of this driver.
+     *
+     * You can connect to MySQL by socket using this new syntax (like PDO DSN):
+     * $dsn = 'mysqli:unix_socket=/cloudsql/app:instance;user=root;pass=;dbname=testdb';
+     * $dsn = 'mypdo:unix_socket=/cloudsql/app:instance;charset=utf8;user=testuser;pass=mypassword;dbname=testdb';
+     *
+     * Connection by host also can be made with this syntax.
+     * Or you can use old syntax:
+     * $dsn = 'mysql://testuser:mypassword@127.0.0.1/testdb';
+     *
      */
-    function connect($dsn)
+    public static function connect($dsn)
     {
         // Load database driver and create its instance.
         $parsed = DbSimple_Generic::parseDSN($dsn);
@@ -96,7 +105,7 @@ function connect($dsn)
         }
         $class = 'DbSimple_'.ucfirst($parsed['scheme']);
         if (!class_exists($class)) {
-            $file = dirname(__FILE__).'/'.ucfirst($parsed['scheme']). ".php";
+            $file = __DIR__.'/'.ucfirst($parsed['scheme']). ".php";
             if (is_file($file)) {
                 require_once($file);
             } else {
@@ -118,19 +127,67 @@ function connect($dsn)
      * Parse a data source name.
      * See parse_url() for details.
      */
-    function parseDSN($dsn)
+    public static function parseDSN($dsn)
     {
         if (is_array($dsn)) return $dsn;
         $parsed = parse_url($dsn);
         if (!$parsed) return null;
+
         $params = null;
         if (!empty($parsed['query'])) {
             parse_str($parsed['query'], $params);
             $parsed += $params;
         }
+
+        if ( empty($parsed['host']) && empty($parsed['socket']) ) {
+            // Parse as DBO DSN string
+            $parsedPdo = self::parseDsnPdo($parsed['path']);
+            unset($parsed['path']);
+            $parsed = array_merge($parsed, $parsedPdo);
+        }
+
         $parsed['dsn'] = $dsn;
         return $parsed;
-    }
-}
+    } // parseDSN
+
+
+    /**
+     * Parse string as DBO DSN string.
+     *
+     * @param $str
+     * @return array
+     */
+    public static function parseDsnPdo($str) {
+
+        if (substr($str, 0, strlen('mysql:')) == 'mysql:') {
+            $str = substr($str, strlen('mysql:'));
+        }
+
+        $arr = explode(';', $str);
+
+        $result = array();
+        foreach ($arr as $k=>$v) {
+            $v = explode('=', $v);
+            if (count($v) == 2)
+                $result[ $v[0] ] = $v[1];
+        }
+
+        if ( isset($result['unix_socket']) ) {
+            $result['socket'] = $result['unix_socket'];
+            unset($result['unix_socket']);
+        }
+
+        if ( isset($result['dbname']) ) {
+            $result['path'] = $result['dbname'];
+            unset($result['dbname']);
+        }
+
+        if ( isset($result['charset']) ) {
+            $result['enc'] = $result['charset'];
+            unset($result['charset']);
+        }
+
+        return $result;
+    } // parseDsnPdo
 
-?>
+} // DbSimple_Generic class
diff --git a/lib/DbSimple/Ibase.php b/lib/DbSimple/Ibase.php
index 839feef..a7e6f31 100644
--- a/lib/DbSimple/Ibase.php
+++ b/lib/DbSimple/Ibase.php
@@ -16,7 +16,7 @@
  *
  * @version 2.x $Id$
  */
-require_once dirname(__FILE__) . '/Database.php';
+require_once __DIR__ . '/Database.php';
 
 /**
  * Best transaction parameters for script queries.
@@ -284,5 +284,3 @@ function _firstUse()
         return true;
     }
 }
-
-?>
\ No newline at end of file
diff --git a/lib/DbSimple/Litepdo.php b/lib/DbSimple/Litepdo.php
index 8c6b523..30ab9f7 100644
--- a/lib/DbSimple/Litepdo.php
+++ b/lib/DbSimple/Litepdo.php
@@ -15,7 +15,7 @@
  *
  * @version 2.x $Id$
  */
-require_once dirname(__FILE__).'/Database.php';
+require_once __DIR__.'/Database.php';
 
 /**
  * Database class for SQLite.
@@ -150,5 +150,3 @@ protected function _performFetch($result)
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/DbSimple/Mssql.php b/lib/DbSimple/Mssql.php
index de6af91..41b62cf 100644
--- a/lib/DbSimple/Mssql.php
+++ b/lib/DbSimple/Mssql.php
@@ -16,7 +16,7 @@
  *
  * @version 2.x $Id: Mssql.php 163 2007-01-10 09:47:49Z dk $
  */
-require_once dirname(__FILE__) . '/Generic.php';
+require_once __DIR__ . '/Generic.php';
 
 
 /**
@@ -43,7 +43,7 @@ function DbSimple_Mssql($dsn)
         );
         $this->_resetLastError();
         if (!$ok) return $this->_setDbError('mssql_connect()');
-        $ok = @mssql_select_db(preg_replace('{^/}s', '', $p['path']), $this->link);
+        $ok = @mssql_select_db(preg_replace('{^/}s', '', $dsn['path']), $this->link);
         if (!$ok) return $this->_setDbError('mssql_select_db()');
     }
 
@@ -241,4 +241,3 @@ function length()
         return strlen($this->blobdata);
     }
 }
-?>
diff --git a/lib/DbSimple/Mypdo.php b/lib/DbSimple/Mypdo.php
index 04c12d6..490bd51 100644
--- a/lib/DbSimple/Mypdo.php
+++ b/lib/DbSimple/Mypdo.php
@@ -15,7 +15,7 @@
  *
  * @version 2.x $Id$
  */
-require_once dirname(__FILE__).'/Database.php';
+require_once __DIR__.'/Database.php';
 
 /**
  * Database class for MySQL.
@@ -31,15 +31,57 @@ public function DbSimple_Mypdo($dsn)
 			return $this->_setLastError("-1", "PDO extension is not loaded", "PDO");
 
 		try {
-			$this->link = new PDO('mysql:host='.$dsn['host'].(empty($dsn['port'])?'':';port='.$dsn['port']).';dbname='.$base,
-				$dsn['user'], isset($dsn['pass'])?$dsn['pass']:'', array(
-					PDO::ATTR_ERRMODE => PDO::ERRMODE_SILENT,
-					PDO::ATTR_PERSISTENT => isset($dsn['persist']) && $dsn['persist'],
-					PDO::ATTR_TIMEOUT => isset($dsn['timeout']) && $dsn['timeout'] ? $dsn['timeout'] : 0,
-					PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES '.(isset($dsn['enc']) ? $dsn['enc'] : 'UTF8'),
-				));
+            $options = array(
+                PDO::ATTR_ERRMODE => PDO::ERRMODE_SILENT,
+                PDO::ATTR_PERSISTENT => isset($dsn['persist']) && $dsn['persist'],
+                PDO::ATTR_TIMEOUT => isset($dsn['timeout']) && $dsn['timeout'] ? $dsn['timeout'] : 0
+            );
+
+            if (version_compare(PHP_VERSION, '5.3.6') < 0) {
+                $phpNew = false;
+                $options[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . (!empty($dsn['enc']) ? $dsn['enc'] : 'utf8');
+            } else {
+                $phpNew = true;
+            }
+
+            if ( !empty($dsn['socket']) ) {
+                // Socket connection
+
+                $dsnPdo = 'mysql:unix_socket=' . $dsn['socket']
+                        . ';dbname=' . $base;
+
+                if ($phpNew) {
+                    $dsnPdo .= ';charset=' . (!empty($dsn['enc']) ? $dsn['enc'] : 'utf8');
+                }
+
+                $this->link = new PDO(
+                    $dsnPdo,
+                    isset($dsn['user']) ? $dsn['user'] : 'root',
+                    isset($dsn['pass']) ? $dsn['pass'] : '',
+                    $options
+                );
+            } else if ( !empty($dsn['host']) ) {
+                // Host connection
+
+                $dsnPdo = 'mysql:host=' . $dsn['host']
+                        . (empty($dsn['port']) ? '' : ';port='.$dsn['port'])
+                        . ';dbname=' . $base;
+
+                if ($phpNew) {
+                    $dsnPdo .= ';charset=' . (!empty($dsn['enc']) ? $dsn['enc'] : 'utf8');
+                }
+
+                $this->link = new PDO(
+                    $dsnPdo,
+                    $dsn['user'],
+                    isset($dsn['pass']) ? $dsn['pass'] : '',
+                    $options
+                );
+            } else {
+                throw new Exception("Could not find hostname nor socket in DSN string");
+            }
 		} catch (PDOException $e) {
-			$this->_setLastError($e->getCode() , $e->getMessage(), 'new PDO');
+			return $this->_setLastError($e->getCode() , $e->getMessage(), 'new PDO');
 		}
 	}
 
@@ -140,5 +182,3 @@ protected function _performFetch($result)
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/lib/DbSimple/Mysql.php b/lib/DbSimple/Mysql.php
index 171ae62..45aeb07 100644
--- a/lib/DbSimple/Mysql.php
+++ b/lib/DbSimple/Mysql.php
@@ -16,7 +16,7 @@
  *
  * @version 2.x $Id: Mysql.php 247 2008-08-18 21:17:08Z dk $
  */
-require_once dirname(__FILE__).'/Database.php';
+require_once __DIR__.'/Database.php';
 
 
 /**
@@ -35,15 +35,24 @@ function DbSimple_Mysql($dsn)
         $connect = 'mysql_'.((isset($dsn['persist']) && $dsn['persist'])?'p':'').'connect';
         if (!is_callable($connect))
             return $this->_setLastError("-1", "MySQL extension is not loaded", $connect);
+
+        //$mysql = mysql_connect(':/cloudsql/' . DB_HOST, DB_USER, DB_PASS);
+
+        if ( !empty($dsn['socket']) && empty($dsn['host']) ) {
+            // Socket connection
+            $dsn['host'] = ':' . $dsn['socket'];
+            unset($dsn['port']);
+        }
+
         $ok = $this->link = @call_user_func($connect,
-            $dsn['host'] . (empty($dsn['port'])? "" : ":".$dsn['port']),
-            empty($dsn['user'])?'':$dsn['user'],
-            empty($dsn['pass'])?'':$dsn['pass'],
+            $str = $dsn['host'] . (empty($dsn['port'])? "" : ":".$dsn['port']),
+            $dsn['user'] = empty($dsn['user'])?'':$dsn['user'],
+            $dsn['pass'] = empty($dsn['pass'])?'':$dsn['pass'],
             true
         );
         $this->_resetLastError();
         if (!$ok)
-            if (!$ok) return $this->_setDbError('mysql_connect("' . $str . '", "' . $p['user'] . '")');
+            if (!$ok) return $this->_setDbError('mysql_connect("' . $str . '", "' . $dsn['user'] . '")');
         $ok = @mysql_select_db(preg_replace('{^/}s', '', $dsn['path']), $this->link);
         if (!$ok)
             return $this->_setDbError('mysql_select_db()');
diff --git a/lib/DbSimple/Mysqli.php b/lib/DbSimple/Mysqli.php
index 78b7d56..6d100e6 100644
--- a/lib/DbSimple/Mysqli.php
+++ b/lib/DbSimple/Mysqli.php
@@ -16,7 +16,7 @@
  *
  * @version 2.x $Id: Mysqli.php 247 2008-08-18 21:17:08Z dk $
  */
-require_once dirname(__FILE__).'/Database.php';
+require_once __DIR__.'/Database.php';
 
 
 /**
@@ -42,14 +42,30 @@ function DbSimple_Mysqli($dsn)
             } else {
                 $dsn["host"] = "p:".$dsn["host"];
             }
-        } 
-        
-        $this->link = mysqli_connect(
-            $dsn['host'] . (empty($dsn['port'])? "" : ":".$dsn['port']),
-            empty($dsn['user'])?'':$dsn['user'],
-            empty($dsn['pass'])?'':$dsn['pass'],
-            preg_replace('{^/}s', '', $dsn['path'])
-        );
+        }
+
+        if ( isset($dsn['socket']) ) {
+            // Socket connection
+            $this->link = mysqli_connect(
+                null                                         // host
+                ,empty($dsn['user']) ? 'root' : $dsn['user'] // user
+                ,empty($dsn['pass']) ? '' : $dsn['pass']     // password
+                ,preg_replace('{^/}s', '', $dsn['path'])     // schema
+                ,null                                        // port
+                ,$dsn['socket']                              // socket
+            );
+        } else if (isset($dsn['host']) ) {
+            // Host connection
+            $this->link = mysqli_connect(
+                $dsn['host']
+                ,empty($dsn['user']) ? 'root' : $dsn['user']
+                ,empty($dsn['pass']) ? '' : $dsn['pass']
+                ,preg_replace('{^/}s', '', $dsn['path'])
+                ,empty($dsn['port']) ? null : $dsn['port']
+            );
+        } else {
+            return $this->_setDbError('mysqli_connect()');
+        }
         $this->_resetLastError();
         if (!$this->link) return $this->_setDbError('mysqli_connect()');
         
@@ -173,7 +189,7 @@ protected function _setDbError($query)
     	if ($this->link) {
 	        return $this->_setLastError(mysqli_errno($this->link), mysqli_error($this->link), $query);
 	    } else {
-	        return $this->_setLastError(mysqli_errno(), mysqli_error(), $query);
+	        return $this->_setLastError(mysqli_connect_errno(), mysqli_connect_error(), $query);
 	    }
     }
 }
@@ -213,4 +229,3 @@ public function length()
         return strlen($this->blobdata);
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/DbSimple/Postgresql.php b/lib/DbSimple/Postgresql.php
index e1c8680..7fe4daf 100644
--- a/lib/DbSimple/Postgresql.php
+++ b/lib/DbSimple/Postgresql.php
@@ -16,7 +16,7 @@
  *
  * @version 2.x $Id$
  */
-require_once dirname(__FILE__) . '/Database.php';
+require_once __DIR__ . '/Database.php';
 
 
 /**
@@ -317,4 +317,3 @@ function _firstUse()
         return true;
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/DbSimple/Sqlite.php b/lib/DbSimple/Sqlite.php
index a477233..f9d7d96 100644
--- a/lib/DbSimple/Sqlite.php
+++ b/lib/DbSimple/Sqlite.php
@@ -14,7 +14,7 @@
  *
  * @version 2.x $Id$
  */
-require_once dirname(__FILE__).'/Database.php';
+require_once __DIR__.'/Database.php';
 
 /**
  * Database class for Sqlite.
@@ -147,4 +147,3 @@ protected function _performFetch($result)
 
 }
 
-?>
\ No newline at end of file
diff --git a/lib/DbSimple/Zend/Cache.php b/lib/DbSimple/Zend/Cache.php
new file mode 100644
index 0000000..aff2e65
--- /dev/null
+++ b/lib/DbSimple/Zend/Cache.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Cache.php 24656 2012-02-26 06:02:53Z adamlundrigan $
+ */
+
+
+/**
+ * @package    Zend_Cache
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Cache
+{
+
+    /**
+     * Standard frontends
+     *
+     * @var array
+     */
+    public static $standardFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
+
+    /**
+     * Standard backends
+     *
+     * @var array
+     */
+    public static $standardBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform',
+                                            'Xcache', 'TwoLevels', 'WinCache', 'ZendServer_Disk', 'ZendServer_ShMem');
+
+    /**
+     * Standard backends which implement the ExtendedInterface
+     *
+     * @var array
+     */
+    public static $standardExtendedBackends = array('File', 'Apc', 'TwoLevels', 'Memcached', 'Libmemcached', 'Sqlite', 'WinCache');
+
+    /**
+     * Only for backward compatibility (may be removed in next major release)
+     *
+     * @var array
+     * @deprecated
+     */
+    public static $availableFrontends = array('Core', 'Output', 'Class', 'File', 'Function', 'Page');
+
+    /**
+     * Only for backward compatibility (may be removed in next major release)
+     *
+     * @var array
+     * @deprecated
+     */
+    public static $availableBackends = array('File', 'Sqlite', 'Memcached', 'Libmemcached', 'Apc', 'ZendPlatform', 'Xcache', 'WinCache', 'TwoLevels');
+
+    /**
+     * Consts for clean() method
+     */
+    const CLEANING_MODE_ALL              = 'all';
+    const CLEANING_MODE_OLD              = 'old';
+    const CLEANING_MODE_MATCHING_TAG     = 'matchingTag';
+    const CLEANING_MODE_NOT_MATCHING_TAG = 'notMatchingTag';
+    const CLEANING_MODE_MATCHING_ANY_TAG = 'matchingAnyTag';
+
+    /**
+     * Factory
+     *
+     * @param mixed  $frontend        frontend name (string) or Zend_Cache_Frontend_ object
+     * @param mixed  $backend         backend name (string) or Zend_Cache_Backend_ object
+     * @param array  $frontendOptions associative array of options for the corresponding frontend constructor
+     * @param array  $backendOptions  associative array of options for the corresponding backend constructor
+     * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name
+     * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name
+     * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends)
+     * @throws Zend_Cache_Exception
+     * @return Zend_Cache_Core|Zend_Cache_Frontend
+     */
+    public static function factory($frontend, $backend, $frontendOptions = array(), $backendOptions = array(), $customFrontendNaming = false, $customBackendNaming = false, $autoload = false)
+    {
+        if (is_string($backend)) {
+            $backendObject = self::_makeBackend($backend, $backendOptions, $customBackendNaming, $autoload);
+        } else {
+            if ((is_object($backend)) && (in_array('Zend_Cache_Backend_Interface', class_implements($backend)))) {
+                $backendObject = $backend;
+            } else {
+                self::throwException('backend must be a backend name (string) or an object which implements Zend_Cache_Backend_Interface');
+            }
+        }
+        if (is_string($frontend)) {
+            $frontendObject = self::_makeFrontend($frontend, $frontendOptions, $customFrontendNaming, $autoload);
+        } else {
+            if (is_object($frontend)) {
+                $frontendObject = $frontend;
+            } else {
+                self::throwException('frontend must be a frontend name (string) or an object');
+            }
+        }
+        $frontendObject->setBackend($backendObject);
+        return $frontendObject;
+    }
+
+    /**
+     * Backend Constructor
+     *
+     * @param string  $backend
+     * @param array   $backendOptions
+     * @param boolean $customBackendNaming
+     * @param boolean $autoload
+     * @return Zend_Cache_Backend
+     */
+    public static function _makeBackend($backend, $backendOptions, $customBackendNaming = false, $autoload = false)
+    {
+        if (!$customBackendNaming) {
+            $backend  = self::_normalizeName($backend);
+        }
+        if (in_array($backend, Zend_Cache::$standardBackends)) {
+            // we use a standard backend
+            $backendClass = 'Zend_Cache_Backend_' . $backend;
+            // security controls are explicit
+            require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
+        } else {
+            // we use a custom backend
+            if (!preg_match('~^[\w\\\\]+$~D', $backend)) {
+                Zend_Cache::throwException("Invalid backend name [$backend]");
+            }
+            if (!$customBackendNaming) {
+                // we use this boolean to avoid an API break
+                $backendClass = 'Zend_Cache_Backend_' . $backend;
+            } else {
+                $backendClass = $backend;
+            }
+            if (!$autoload) {
+                $file = str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php';
+                if (!(self::_isReadable($file))) {
+                    self::throwException("file $file not found in include_path");
+                }
+                require_once $file;
+            }
+        }
+        return new $backendClass($backendOptions);
+    }
+
+    /**
+     * Frontend Constructor
+     *
+     * @param string  $frontend
+     * @param array   $frontendOptions
+     * @param boolean $customFrontendNaming
+     * @param boolean $autoload
+     * @return Zend_Cache_Core|Zend_Cache_Frontend
+     */
+    public static function _makeFrontend($frontend, $frontendOptions = array(), $customFrontendNaming = false, $autoload = false)
+    {
+        if (!$customFrontendNaming) {
+            $frontend = self::_normalizeName($frontend);
+        }
+        if (in_array($frontend, self::$standardFrontends)) {
+            // we use a standard frontend
+            // For perfs reasons, with frontend == 'Core', we can interact with the Core itself
+            $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend;
+            // security controls are explicit
+            require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
+        } else {
+            // we use a custom frontend
+            if (!preg_match('~^[\w\\\\]+$~D', $frontend)) {
+                Zend_Cache::throwException("Invalid frontend name [$frontend]");
+            }
+            if (!$customFrontendNaming) {
+                // we use this boolean to avoid an API break
+                $frontendClass = 'Zend_Cache_Frontend_' . $frontend;
+            } else {
+                $frontendClass = $frontend;
+            }
+            if (!$autoload) {
+                $file = str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php';
+                if (!(self::_isReadable($file))) {
+                    self::throwException("file $file not found in include_path");
+                }
+                require_once $file;
+            }
+        }
+        return new $frontendClass($frontendOptions);
+    }
+
+    /**
+     * Throw an exception
+     *
+     * Note : for perf reasons, the "load" of Zend/Cache/Exception is dynamic
+     * @param  string $msg  Message for the exception
+     * @throws Zend_Cache_Exception
+     */
+    public static function throwException($msg, Exception $e = null)
+    {
+        // For perfs reasons, we use this dynamic inclusion
+        require_once 'Zend/Cache/Exception.php';
+        throw new Zend_Cache_Exception($msg, 0, $e);
+    }
+
+    /**
+     * Normalize frontend and backend names to allow multiple words TitleCased
+     *
+     * @param  string $name  Name to normalize
+     * @return string
+     */
+    protected static function _normalizeName($name)
+    {
+        $name = ucfirst(strtolower($name));
+        $name = str_replace(array('-', '_', '.'), ' ', $name);
+        $name = ucwords($name);
+        $name = str_replace(' ', '', $name);
+        if (stripos($name, 'ZendServer') === 0) {
+            $name = 'ZendServer_' . substr($name, strlen('ZendServer'));
+        }
+
+        return $name;
+    }
+
+    /**
+     * Returns TRUE if the $filename is readable, or FALSE otherwise.
+     * This function uses the PHP include_path, where PHP's is_readable()
+     * does not.
+     *
+     * Note : this method comes from Zend_Loader (see #ZF-2891 for details)
+     *
+     * @param string   $filename
+     * @return boolean
+     */
+    private static function _isReadable($filename)
+    {
+        if (!$fh = @fopen($filename, 'r', true)) {
+            return false;
+        }
+        @fclose($fh);
+        return true;
+    }
+
+}
diff --git a/lib/DbSimple/Zend/Cache/Backend/Interface.php b/lib/DbSimple/Zend/Cache/Backend/Interface.php
new file mode 100644
index 0000000..3f44e2e
--- /dev/null
+++ b/lib/DbSimple/Zend/Cache/Backend/Interface.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $
+ */
+
+
+/**
+ * @package    Zend_Cache
+ * @subpackage Zend_Cache_Backend
+ * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+interface Zend_Cache_Backend_Interface
+{
+    /**
+     * Set the frontend directives
+     *
+     * @param array $directives assoc of directives
+     */
+    public function setDirectives($directives);
+
+    /**
+     * Test if a cache is available for the given id and (if yes) return it (false else)
+     *
+     * Note : return value is always "string" (unserialization is done by the core not by the backend)
+     *
+     * @param  string  $id                     Cache id
+     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
+     * @return string|false cached datas
+     */
+    public function load($id, $doNotTestCacheValidity = false);
+
+    /**
+     * Test if a cache is available or not (for the given id)
+     *
+     * @param  string $id cache id
+     * @return mixed|false (a cache is not available) or "last modified" timestamp (int) of the available cache record
+     */
+    public function test($id);
+
+    /**
+     * Save some string datas into a cache record
+     *
+     * Note : $data is always "string" (serialization is done by the
+     * core not by the backend)
+     *
+     * @param  string $data            Datas to cache
+     * @param  string $id              Cache id
+     * @param  array $tags             Array of strings, the cache record will be tagged by each string entry
+     * @param  int   $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime)
+     * @return boolean true if no problem
+     */
+    public function save($data, $id, $tags = array(), $specificLifetime = false);
+
+    /**
+     * Remove a cache record
+     *
+     * @param  string $id Cache id
+     * @return boolean True if no problem
+     */
+    public function remove($id);
+
+    /**
+     * Clean some cache records
+     *
+     * Available modes are :
+     * Zend_Cache::CLEANING_MODE_ALL (default)    => remove all cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_OLD              => remove too old cache entries ($tags is not used)
+     * Zend_Cache::CLEANING_MODE_MATCHING_TAG     => remove cache entries matching all given tags
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG => remove cache entries not {matching one of the given tags}
+     *                                               ($tags can be an array of strings or a single string)
+     * Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG => remove cache entries matching any given tags
+     *                                               ($tags can be an array of strings or a single string)
+     *
+     * @param  string $mode Clean mode
+     * @param  array  $tags Array of tags
+     * @return boolean true if no problem
+     */
+    public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array());
+
+}
diff --git a/lib/config.php b/lib/config.php
index b9c5207..46cf1f9 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -2,5 +2,5 @@
 // Подключается ко всем сценариям (автоматически или вручную)
 if (!defined("PATH_SEPARATOR"))
   define("PATH_SEPARATOR", getenv("COMSPEC")? ";" : ":");
-ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.dirname(__FILE__));
+ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.__DIR__);
 ?>
\ No newline at end of file
diff --git a/t/Cache/TstCacher.php b/t/Cache/TstCacher.php
index efeff2d..68e0f9b 100644
--- a/t/Cache/TstCacher.php
+++ b/t/Cache/TstCacher.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__).'/Interface.php';
+require_once __DIR__.'/Interface.php';
 
 class TstCacher implements Zend_Cache_Backend_Interface
 {
diff --git a/t/DbSimple/Generic/010_array_key.phpt b/t/DbSimple/Generic/010_array_key.phpt
index b3fe196..5fa046c 100644
--- a/t/DbSimple/Generic/010_array_key.phpt
+++ b/t/DbSimple/Generic/010_array_key.phpt
@@ -2,7 +2,7 @@
 Generic: ARRAY_KEY* usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/020_parent_key.phpt b/t/DbSimple/Generic/020_parent_key.phpt
index c0b10b8..95a5d50 100644
--- a/t/DbSimple/Generic/020_parent_key.phpt
+++ b/t/DbSimple/Generic/020_parent_key.phpt
@@ -2,7 +2,7 @@
 Generic: ARRAY_KEY/PARENT_KEY usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/021_sys_alias_ci.phpt b/t/DbSimple/Generic/021_sys_alias_ci.phpt
index 4a00799..2694446 100644
--- a/t/DbSimple/Generic/021_sys_alias_ci.phpt
+++ b/t/DbSimple/Generic/021_sys_alias_ci.phpt
@@ -2,7 +2,7 @@
 Generic: ARRAY_KEY/PARENT_KEY case insensitivity
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/030_select_cell.phpt b/t/DbSimple/Generic/030_select_cell.phpt
index d977f7d..f2798db 100644
--- a/t/DbSimple/Generic/030_select_cell.phpt
+++ b/t/DbSimple/Generic/030_select_cell.phpt
@@ -2,7 +2,7 @@
 Generic: selectCell() usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/040_select_col.phpt b/t/DbSimple/Generic/040_select_col.phpt
index 55669c8..51d9692 100644
--- a/t/DbSimple/Generic/040_select_col.phpt
+++ b/t/DbSimple/Generic/040_select_col.phpt
@@ -2,7 +2,7 @@
 Generic: selectCol() usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/040_select_col_multi.phpt b/t/DbSimple/Generic/040_select_col_multi.phpt
index ee6d303..0600526 100644
--- a/t/DbSimple/Generic/040_select_col_multi.phpt
+++ b/t/DbSimple/Generic/040_select_col_multi.phpt
@@ -2,7 +2,7 @@
 Generic: selectCol() usage with multi-dimensional array
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/050_select_row.phpt b/t/DbSimple/Generic/050_select_row.phpt
index 73c9df7..ed470c3 100644
--- a/t/DbSimple/Generic/050_select_row.phpt
+++ b/t/DbSimple/Generic/050_select_row.phpt
@@ -2,7 +2,7 @@
 Generic: selectRow(); usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/060_cache.phpt b/t/DbSimple/Generic/060_cache.phpt
index eea0dd8..d6605e9 100644
--- a/t/DbSimple/Generic/060_cache.phpt
+++ b/t/DbSimple/Generic/060_cache.phpt
@@ -2,11 +2,11 @@
 Generic: Zend_Cache usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
-	require_once dirname(__FILE__) . '/../../Cache/TstCacher.php';
+	require_once __DIR__ . '/../../Cache/TstCacher.php';
 	$DB->setCacher($Cacher = new TstCacher());
 	$query = "
         -- CACHE: 10
diff --git a/t/DbSimple/Generic/070_nested_blocks.phpt b/t/DbSimple/Generic/070_nested_blocks.phpt
index c47a40b..4ee8dab 100644
--- a/t/DbSimple/Generic/070_nested_blocks.phpt
+++ b/t/DbSimple/Generic/070_nested_blocks.phpt
@@ -2,7 +2,7 @@
 Generic: nested {}-blocks usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/080_nestad_if_blocks.phpt b/t/DbSimple/Generic/080_nestad_if_blocks.phpt
index 2346e3b..38b8700 100644
--- a/t/DbSimple/Generic/080_nestad_if_blocks.phpt
+++ b/t/DbSimple/Generic/080_nestad_if_blocks.phpt
@@ -2,7 +2,7 @@
 Generic: nested {|}-blocks usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/090_nestad_optional.phpt b/t/DbSimple/Generic/090_nestad_optional.phpt
index 7ff2e67..9d65e72 100644
--- a/t/DbSimple/Generic/090_nestad_optional.phpt
+++ b/t/DbSimple/Generic/090_nestad_optional.phpt
@@ -2,7 +2,7 @@
 Generic: nested {? }-blocks usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/100_table_ident_pholder.phpt b/t/DbSimple/Generic/100_table_ident_pholder.phpt
index ca365fc..ad6dc0d 100644
--- a/t/DbSimple/Generic/100_table_ident_pholder.phpt
+++ b/t/DbSimple/Generic/100_table_ident_pholder.phpt
@@ -2,7 +2,7 @@
 Generic: identifier placeholderwith tablename
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/110_table_array_pholder.phpt b/t/DbSimple/Generic/110_table_array_pholder.phpt
index b07c35b..773af38 100644
--- a/t/DbSimple/Generic/110_table_array_pholder.phpt
+++ b/t/DbSimple/Generic/110_table_array_pholder.phpt
@@ -2,7 +2,7 @@
 Generic: array placeholder
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/120_subquery.phpt b/t/DbSimple/Generic/120_subquery.phpt
index 0bdad30..4935941 100644
--- a/t/DbSimple/Generic/120_subquery.phpt
+++ b/t/DbSimple/Generic/120_subquery.phpt
@@ -2,7 +2,7 @@
 Generic: subQuery function
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Generic/130_cache_table.phpt b/t/DbSimple/Generic/130_cache_table.phpt
index fa113ca..250dc0e 100644
--- a/t/DbSimple/Generic/130_cache_table.phpt
+++ b/t/DbSimple/Generic/130_cache_table.phpt
@@ -2,11 +2,11 @@
 Generic: modify table test
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
-	require_once dirname(__FILE__) . '/../../Cache/TstCacher.php';
+	require_once __DIR__ . '/../../Cache/TstCacher.php';
 	$DB->setCacher(new TstCacher());
 	$query = "-- CACHE: test.m
         SELECT * FROM test";
diff --git a/t/DbSimple/Generic/140_class_row.phpt b/t/DbSimple/Generic/140_class_row.phpt
index 294f308..90ab38b 100644
--- a/t/DbSimple/Generic/140_class_row.phpt
+++ b/t/DbSimple/Generic/140_class_row.phpt
@@ -2,7 +2,7 @@
 Generic: row class
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 class r
 {
diff --git a/t/DbSimple/Mysql/010_cell_placeholder.phpt b/t/DbSimple/Mysql/010_cell_placeholder.phpt
index bcad095..b85e90e 100644
--- a/t/DbSimple/Mysql/010_cell_placeholder.phpt
+++ b/t/DbSimple/Mysql/010_cell_placeholder.phpt
@@ -2,7 +2,7 @@
 Mysql: ?# placeholder usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Mysql/020_charset.phpt b/t/DbSimple/Mysql/020_charset.phpt
index 0c39609..6a6f657 100644
--- a/t/DbSimple/Mysql/020_charset.phpt
+++ b/t/DbSimple/Mysql/020_charset.phpt
@@ -2,7 +2,7 @@
 Mysql: ?# placeholder usage
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Other/010_error_handler.phpt b/t/DbSimple/Other/010_error_handler.phpt
index b77af54..7304367 100644
--- a/t/DbSimple/Other/010_error_handler.phpt
+++ b/t/DbSimple/Other/010_error_handler.phpt
@@ -2,7 +2,7 @@
 Error handler call_user_func
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init_lasy.php';
+require_once __DIR__ . '/../init_lasy.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Other/020_connect_nonex.phpt b/t/DbSimple/Other/020_connect_nonex.phpt
index 891704e..9d062ad 100644
--- a/t/DbSimple/Other/020_connect_nonex.phpt
+++ b/t/DbSimple/Other/020_connect_nonex.phpt
@@ -2,7 +2,7 @@
 Connect to non existed DB
 --FILE--
 <?php ## Подключение к БД.
-require_once dirname(__FILE__)."/../../../lib/config.php";
+require_once __DIR__."/../../../lib/config.php";
 require_once "DbSimple/Generic.php";
 
 // Подключаемся к БД.
@@ -16,7 +16,7 @@ function databaseErrorHandler($message, $info)
 {
 	// Если использовалась @, ничего не делать.
 	if (!error_reporting()) return;
-	$dir = dirname(__FILE__). '/';
+	$dir = __DIR__. '/';
 	$rpath = str_replace($dir, '', $info['context']);
 	echo "Error: ".$info['message']."\n";
 	echo "Context: ".$rpath."\n";
diff --git a/t/DbSimple/Other/030_init_query.phpt b/t/DbSimple/Other/030_init_query.phpt
index 5b2e26e..c1d52e3 100644
--- a/t/DbSimple/Other/030_init_query.phpt
+++ b/t/DbSimple/Other/030_init_query.phpt
@@ -2,7 +2,7 @@
 Init query on connect
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init_lasy.php';
+require_once __DIR__ . '/../init_lasy.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Other/040_connect_set.phpt b/t/DbSimple/Other/040_connect_set.phpt
index 00be51a..1898e96 100644
--- a/t/DbSimple/Other/040_connect_set.phpt
+++ b/t/DbSimple/Other/040_connect_set.phpt
@@ -2,13 +2,13 @@
 Set prefixes
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init_lasy.php';
+require_once __DIR__ . '/../init_lasy.php';
 
 function main(&$DB)
 {
 	$DB->setIdentPrefix('as_');
 	$DB->setCachePrefix('db_');
-	require_once dirname(__FILE__) . '/../../Cache/TstCacher.php';
+	require_once __DIR__ . '/../../Cache/TstCacher.php';
 	$DB->setCacher($Cacher = new TstCacher());
 	$query = "
         -- CACHE: 10
diff --git a/t/DbSimple/Postgresql/005_connect_error.phpt b/t/DbSimple/Postgresql/005_connect_error.phpt
index 78a9733..596180b 100644
--- a/t/DbSimple/Postgresql/005_connect_error.phpt
+++ b/t/DbSimple/Postgresql/005_connect_error.phpt
@@ -4,7 +4,7 @@ Postgresql: connection error catching
 --FILE--
 <?php
 $DSN[] = "postgresql://user:pass@127.0.0.1:55555/test";
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/010_native_pholder.phpt b/t/DbSimple/Postgresql/010_native_pholder.phpt
index 085fa2b..87c595b 100644
--- a/t/DbSimple/Postgresql/010_native_pholder.phpt
+++ b/t/DbSimple/Postgresql/010_native_pholder.phpt
@@ -3,7 +3,7 @@ Postgresql: native placeholders support
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/020_cell_placeholder.phpt b/t/DbSimple/Postgresql/020_cell_placeholder.phpt
index 3169acf..ad9287b 100644
--- a/t/DbSimple/Postgresql/020_cell_placeholder.phpt
+++ b/t/DbSimple/Postgresql/020_cell_placeholder.phpt
@@ -3,7 +3,7 @@ PostgreSQL: ?# placeholder usage
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/030_last_insert_id.phpt b/t/DbSimple/Postgresql/030_last_insert_id.phpt
index d1013ba..b492ffb 100644
--- a/t/DbSimple/Postgresql/030_last_insert_id.phpt
+++ b/t/DbSimple/Postgresql/030_last_insert_id.phpt
@@ -3,7 +3,7 @@ PostgreSQL: returning of last inserted ID
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/040_insert_rule.phpt b/t/DbSimple/Postgresql/040_insert_rule.phpt
index 901f72b..dce8013 100644
--- a/t/DbSimple/Postgresql/040_insert_rule.phpt
+++ b/t/DbSimple/Postgresql/040_insert_rule.phpt
@@ -3,7 +3,7 @@ PostgreSQL: returning result of RULE after INSERT
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/050_escaping.phpt b/t/DbSimple/Postgresql/050_escaping.phpt
index ca247ef..7f028f8 100644
--- a/t/DbSimple/Postgresql/050_escaping.phpt
+++ b/t/DbSimple/Postgresql/050_escaping.phpt
@@ -3,7 +3,7 @@ PostgreSQL: excaping test
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/060_double_connections.phpt b/t/DbSimple/Postgresql/060_double_connections.phpt
index ac84194..c29a493 100644
--- a/t/DbSimple/Postgresql/060_double_connections.phpt
+++ b/t/DbSimple/Postgresql/060_double_connections.phpt
@@ -3,7 +3,7 @@ PostgreSQL: connect twice even with same DSNs
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 function main(&$DB)
 {
diff --git a/t/DbSimple/Postgresql/070_no_save_error_prepare.phpt b/t/DbSimple/Postgresql/070_no_save_error_prepare.phpt
index 6d11592..15c1422 100644
--- a/t/DbSimple/Postgresql/070_no_save_error_prepare.phpt
+++ b/t/DbSimple/Postgresql/070_no_save_error_prepare.phpt
@@ -3,7 +3,7 @@ PostgreSQL: do not save errorous prepared statements
 
 --FILE--
 <?php
-require_once dirname(__FILE__) . '/../init.php';
+require_once __DIR__ . '/../init.php';
 
 $LAST_ERROR = null;
 function errorSaver($msg, $error)
diff --git a/t/DbSimple/init.php b/t/DbSimple/init.php
index 8dd1e53..08eaa64 100644
--- a/t/DbSimple/init.php
+++ b/t/DbSimple/init.php
@@ -3,8 +3,8 @@
 chdir(dirname(realpath($stack[0]['file'])));
 
 header("Content-type: text/plain");
-include_once dirname(__FILE__) . "/../../lib/config.php";
-ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.dirname(__FILE__).'/..'); // for Cache_Lite
+include_once __DIR__ . "/../../lib/config.php";
+ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.__DIR__.'/..'); // for Cache_Lite
 include_once "DbSimple/Generic.php"; 
 
 if (!is_array(@$DSN)) {
@@ -13,7 +13,7 @@
 	$dsnOwn = trim(@join("", file($dsnFile)));
 	if (!$dsnOwn) die("Current directory must contain $dsnFile file!");
 	if ($dsnOwn == '*' || preg_match('/^\w+$/', $dsnOwn)) {
-		$dir = dirname(__FILE__);
+		$dir = __DIR__;
 		$d = opendir($dir);
 		while (false !== ($e = readdir($d))) {
 			$full = realpath("$dir/$e");
diff --git a/t/DbSimple/init_lasy.php b/t/DbSimple/init_lasy.php
index 73e6d9a..9f64074 100644
--- a/t/DbSimple/init_lasy.php
+++ b/t/DbSimple/init_lasy.php
@@ -3,8 +3,8 @@
 chdir(dirname(realpath($stack[0]['file'])));
 
 header("Content-type: text/plain");
-include_once dirname(__FILE__) . "/../../lib/config.php";
-ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.dirname(__FILE__).'/..'); // for Cache_Lite
+include_once __DIR__ . "/../../lib/config.php";
+ini_set("include_path", ini_get("include_path").PATH_SEPARATOR.__DIR__.'/..'); // for Cache_Lite
 include_once "DbSimple/Connect.php"; 
 
 $DSN = array();
@@ -13,7 +13,7 @@
 $dsnOwn = trim(@join("", file($dsnFile)));
 if (!$dsnOwn) die("Current directory must contain $dsnFile file!");
 if ($dsnOwn == '*' || preg_match('/^\w+$/', $dsnOwn)) {
-	$dir = dirname(__FILE__);
+	$dir = __DIR__;
 	$d = opendir($dir);
 	while (false !== ($e = readdir($d))) {
 		$full = realpath("$dir/$e");
@@ -42,7 +42,7 @@ function queryLogger(&$DB, $query)
 function errorHandler($msg, $error)
 {
 	if (!error_reporting()) return;
-	$dir = dirname(__FILE__). '/';
+	$dir = __DIR__. '/';
 	$rpath = str_replace($dir, '', $error['context']);
 	printr($error['message'], "Error");
 	printr($rpath, "Context");