Index: DBIx-SearchBuilder-1.38/Makefile.PL --- DBIx-SearchBuilder-1.38/Makefile.PL.orig 2006-01-04 09:48:34 +0100 +++ DBIx-SearchBuilder-1.38/Makefile.PL 2006-01-04 10:01:18 +0100 @@ -7,7 +7,7 @@ requires('Want'); requires('Encode'); requires('Class::ReturnValue', 0.40); -requires('Cache::Simple::TimedExpiry' => '0.21'); +requires('Cache::MemoryCache'); requires('Clone'); build_requires('Test::More' => 0.52); build_requires('DBD::SQLite'); Index: DBIx-SearchBuilder-1.38/SearchBuilder/Record/Cachable.pm --- DBIx-SearchBuilder-1.38/SearchBuilder/Record/Cachable.pm.orig 2005-07-15 23:24:29 +0200 +++ DBIx-SearchBuilder-1.38/SearchBuilder/Record/Cachable.pm 2006-01-04 10:00:29 +0100 @@ -7,7 +7,7 @@ use DBIx::SearchBuilder::Handle; @ISA = qw (DBIx::SearchBuilder::Record); -use Cache::Simple::TimedExpiry; +use Cache::MemoryCache; use strict; @@ -49,8 +49,10 @@ sub _SetupCache { my $self = shift; my $cache = shift; - $_CACHES{$cache} = Cache::Simple::TimedExpiry->new(); - $_CACHES{$cache}->expire_after( $self->_CacheConfig->{'cache_for_sec'} ); + $_CACHES{$cache} = Cache::MemoryCache->new({ + 'namespace' => 'DBIx::SearchBuilder::Record::Cache($cache)', + 'default_expires_in' => $self->_CacheConfig->{'cache_for_sec'} + }); } =head2 FlushCache @@ -195,7 +197,7 @@ sub _fetch () { my ( $self, $cache_key ) = @_; - my $data = $self->_RecordCache->fetch($cache_key) or return; + my $data = $self->_RecordCache->get($cache_key) or return; @{$self}{keys %$data} = values %$data; # deserialize return 1; @@ -306,13 +308,13 @@ my $alternate_key = shift; return undef unless ($alternate_key); - my $primary_key = $self->_KeyCache->fetch($alternate_key); + my $primary_key = $self->_KeyCache->get($alternate_key); if ($primary_key) { return ($primary_key); } # If the alternate key is really the primary one - elsif ( $self->_RecordCache->fetch($alternate_key) ) { + elsif ( $self->_RecordCache->get($alternate_key) ) { return ($alternate_key); } else { # empty!